Merge pull request #7 from davmillar/drag-drop-fix

Fixed drag and drop faulty behavior
ao5357 · Oct 31, 2017 · 98e9553 · 98e9553
2 parents 730457d + db15f5c
commit 98e9553
Showing 1 changed file with 28 additions and 6 deletions.
diff --git a/options/deps/behaviors.js b/options/deps/behaviors.js
@@ -94,6 +94,16 @@ document.addEventListener('DOMContentLoaded',function() {
     });
   }
 
+  var findParentFieldset = function (domElement) {
+    while (domElement.tagName.toUpperCase() !== 'FIELDSET' && domElement.tagName.toUpperCase() !== 'BODY') {
+      domElement = domElement.parentNode;
+    }
+    if (domElement.tagName.toUpperCase() === 'FIELDSET') {
+      return domElement;
+    }
+    return null;
+  };
+
   /**
    * The form should never submit.
    */
@@ -132,22 +142,34 @@ document.addEventListener('DOMContentLoaded',function() {
   }, false);
 
   options.rowForm.addEventListener('dragenter', function(evt) {
-    evt.srcElement.classList.add('over');
+    var targetElement = findParentFieldset(evt.srcElement);
+
+    if (targetElement) {
+      targetElement.classList.add('over');
+    }
   }, false);
 
   options.rowForm.addEventListener('dragleave', function(evt) {
-    evt.srcElement.classList.remove('over');
+    var targetElement = findParentFieldset(evt.srcElement);
+
+    if (targetElement) {
+      targetElement.classList.remove('over');
+    }
   }, false);
 
   options.rowForm.addEventListener('dragover', function(evt) {
     evt.preventDefault();
   }, false);
 
   options.rowForm.addEventListener('drop', function(evt) {
-    evt.srcElement.classList.remove('over');
-    srcElem.innerHTML = evt.srcElement.innerHTML;
-    evt.srcElement.innerHTML = evt.dataTransfer.getData('text/html');
-    saveValues();
+    var targetElement = findParentFieldset(evt.srcElement);
+
+    if (targetElement) {
+      targetElement.classList.remove('over');
+      srcElem.innerHTML = targetElement.innerHTML;
+      targetElement.innerHTML = evt.dataTransfer.getData('text/html');
+      saveValues();
+    }
   }, false);
 
   /**