Merge pull request #6842 from cs09g/cs09g-patch-1

add condition to check if active

src/ol/interaction/draganddrop.js

@@ -65,14 +65,17 @@ ol.inherits(ol.interaction.DragAndDrop, ol.interaction.Interaction);
  * @private
  */
 ol.interaction.DragAndDrop.handleDrop_ = function(event) {
-  var files = event.dataTransfer.files;
+  var active = this.getActive();
-  var i, ii, file;
+  if (active) {
-  for (i = 0, ii = files.length; i < ii; ++i) {
+    var files = event.dataTransfer.files;
-    file = files.item(i);
+    var i, ii, file;
-    var reader = new FileReader();
+    for (i = 0, ii = files.length; i < ii; ++i) {
-    reader.addEventListener(ol.events.EventType.LOAD,
+      file = files.item(i);
-        this.handleResult_.bind(this, file));
+      var reader = new FileReader();
-    reader.readAsText(file);
+      reader.addEventListener(ol.events.EventType.LOAD,
+          this.handleResult_.bind(this, file));
+      reader.readAsText(file);
+    }
   }
 };
 
@@ -82,9 +85,12 @@ ol.interaction.DragAndDrop.handleDrop_ = function(event) {
  * @private
  */
 ol.interaction.DragAndDrop.handleStop_ = function(event) {
-  event.stopPropagation();
+  var active = this.getActive();
-  event.preventDefault();
+  if (active) {
-  event.dataTransfer.dropEffect = 'copy';
+    event.stopPropagation();
+    event.preventDefault();
+    event.dataTransfer.dropEffect = 'copy';
+  }
 };