Tuch#41 Fixed scrolling breakes draggable element

dintecom · Jan 11, 2017 · 9143698 · 9143698
1 parent 85d5568
commit 9143698
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/dist/angular-dnd.js b/dist/angular-dnd.js
@@ -600,14 +600,17 @@ extend($.prototype, {
 
     dndGetFirstNotStaticParent: function() {
         var ret, position, parents = this.dndClosest();
+        var self = this[0];
 
+        var parentExists = false;
         forEach(parents, function(element) {
+            if (!parentExists && element !== self) {
+                position = $(element).dndCss('position');
 
-            position = $(element).dndCss('position');
-
-            if ( position === 'absolute' || position === 'relative' || position === 'fixed' ) {
-                ret = element;
-                return false;
+                if (position === 'absolute' || position === 'relative' || position === 'fixed') {
+                    ret = element;
+                    parentExists = true;
+                }
             }
         });
 

diff --git a/dist/angular-dnd.min.js b/dist/angular-dnd.min.js
diff --git a/src/core.js b/src/core.js
@@ -598,14 +598,17 @@ extend($.prototype, {
 
     dndGetFirstNotStaticParent: function() {
         var ret, position, parents = this.dndClosest();
+        var self = this[0];
 
+        var parentExists = false;
         forEach(parents, function(element) {
+            if (!parentExists && element !== self) {
+                position = $(element).dndCss('position');
 
-            position = $(element).dndCss('position');
-
-            if ( position === 'absolute' || position === 'relative' || position === 'fixed' ) {
-                ret = element;
-                return false;
+                if (position === 'absolute' || position === 'relative' || position === 'fixed') {
+                    ret = element;
+                    parentExists = true;
+                }
             }
         });
 

diff --git a/src/directives/dndkeyModel.js → src/directives/dndKeyModel.js b/src/directives/dndkeyModel.js → src/directives/dndKeyModel.js