Skip to content

Commit e2cb7c9

Browse files
committed
Merge pull request angular-dragdrop#90 from kfreisen/master
Prevent Event Bubbling On Drag Hover
2 parents 3d554ce + bafccbf commit e2cb7c9

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

draganddrop.js

+19-3
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,30 @@ angular.module("ang-drag-drop",[])
153153
}
154154

155155
function onDragLeave(e) {
156-
dragging--;
156+
if (e.preventDefault) {
157+
e.preventDefault();
158+
}
159+
160+
if (e.stopPropagation) {
161+
e.stopPropagation();
162+
}
163+
dragging--;
164+
157165
if (dragging == 0) {
158166
element.removeClass(dragHoverClass);
159167
}
160168
}
161169

162-
function onDragEnter(e) {
163-
dragging++;
170+
function onDragEnter(e) {
171+
if (e.preventDefault) {
172+
e.preventDefault();
173+
}
174+
175+
if (e.stopPropagation) {
176+
e.stopPropagation();
177+
}
178+
dragging++;
179+
164180
$rootScope.$broadcast("ANGULAR_HOVER", dragChannel);
165181
element.addClass(dragHoverClass);
166182
}

0 commit comments

Comments
 (0)