diff --git a/scripts/system/html/entityList.html b/scripts/system/html/entityList.html
index 6915a45f19..f9948bc8b0 100644
--- a/scripts/system/html/entityList.html
+++ b/scripts/system/html/entityList.html
@@ -18,6 +18,7 @@
+
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 01395368b0..a8bcabbfea 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -23,6 +23,7 @@
+
diff --git a/scripts/system/html/gridControls.html b/scripts/system/html/gridControls.html
index 4be002619a..8d6ee34bc0 100644
--- a/scripts/system/html/gridControls.html
+++ b/scripts/system/html/gridControls.html
@@ -16,6 +16,7 @@
+
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index 15353db48e..3da26a0596 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -1287,8 +1287,9 @@ function loaded() {
});
augmentSpinButtons();
+ disableDragDrop();
- document.addEventListener("contextmenu", function (event) {
+ document.addEventListener("contextmenu", function(event) {
entityListContextMenu.close();
// Disable default right-click context menu which is not visible in the HMD and makes it seem like the app has locked
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 1026fbfdeb..da6a79d23a 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -3529,6 +3529,7 @@ function loaded() {
});
augmentSpinButtons();
+ disableDragDrop();
// Disable right-click context menu which is not visible in the HMD and makes it seem like the app has locked
document.addEventListener("contextmenu", function(event) {
diff --git a/scripts/system/html/js/gridControls.js b/scripts/system/html/js/gridControls.js
index 3e5bfa1e2f..e27dac522b 100644
--- a/scripts/system/html/js/gridControls.js
+++ b/scripts/system/html/js/gridControls.js
@@ -108,6 +108,7 @@ function loaded() {
});
augmentSpinButtons();
+ disableDragDrop();
EventBridge.emitWebEvent(JSON.stringify({ type: 'init' }));
});
diff --git a/scripts/system/html/js/utils.js b/scripts/system/html/js/utils.js
new file mode 100644
index 0000000000..d61b4d1762
--- /dev/null
+++ b/scripts/system/html/js/utils.js
@@ -0,0 +1,27 @@
+//
+// utils.js
+//
+// Created by David Back on 19 Nov 2018
+// Copyright 2016 High Fidelity, Inc.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+function disableDragDrop() {
+ document.addEventListener("drop", function(event) {
+ event.preventDefault();
+ });
+
+ document.addEventListener("dragover", function(event) {
+ event.dataTransfer.effectAllowed = "none";
+ event.dataTransfer.dropEffect = "none";
+ event.preventDefault();
+ });
+
+ document.addEventListener("dragenter", function(event) {
+ event.dataTransfer.effectAllowed = "none";
+ event.dataTransfer.dropEffect = "none";
+ event.preventDefault();
+ }, false);
+}