Remove dndDraggingSource class immediately as well as after a timeout. …

…Fixes marceljuenemann#121
lavary · Dec 26, 2016 · b58a6c2 · b58a6c2
1 parent 68e5f58
commit b58a6c2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/angular-drag-and-drop-lists.js b/angular-drag-and-drop-lists.js
@@ -157,10 +157,13 @@
         });
 
         // Clean up
-        element.removeClass("dndDragging");
-        $timeout(function() { element.removeClass("dndDraggingSource"); }, 0);
         dndState.isDragging = false;
+        element.removeClass("dndDragging");
+        element.removeClass("dndDraggingSource");
         event.stopPropagation();
+
+        // In IE9 it is possible that the timeout from dragstart triggers after the dragend handler.
+        $timeout(function() { element.removeClass("dndDraggingSource"); }, 0);
       });
 
       /**

diff --git a/test/dndDraggableSpec.js b/test/dndDraggableSpec.js
@@ -123,9 +123,20 @@ describe('dndDraggable', function() {
 
       dragstart.dragend(element);
       expect(element.hasClass('dndDragging')).toBe(false);
-      expect(element.hasClass('dndDraggingSource')).toBe(true);
+      expect(element.hasClass('dndDraggingSource')).toBe(false);
+    }));
+
+    it('removes dndDraggingSource after a timeout', inject(function($timeout) {
+      // IE 9 might not flush the $timeout before invoking the dragend handler.
+      expect(element.hasClass('dndDragging')).toBe(true);
+      expect(element.hasClass('dndDraggingSource')).toBe(false);
+
+      dragstart.dragend(element);
+      expect(element.hasClass('dndDragging')).toBe(false);
+      expect(element.hasClass('dndDraggingSource')).toBe(false);
 
       $timeout.flush(0);
+      expect(element.hasClass('dndDragging')).toBe(false);
       expect(element.hasClass('dndDraggingSource')).toBe(false);
     }));