Skip to content

Commit 23693a1

Browse files
committed
merge the pull-request: do not start drag if dnd-nodrag && no dnd-handle marceljuenemann#432
marceljuenemann#432
1 parent 49c890b commit 23693a1

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

angular-drag-and-drop-lists.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@
9797
// Check whether the element is draggable, since dragstart might be triggered on a child.
9898
if (element.attr('draggable') == 'false') return true;
9999

100+
// merge the pull-request: do not start drag if dnd-nodrag && no dnd-handle #432
101+
// https://github.com/marceljuenemann/angular-drag-and-drop-lists/pull/432
102+
if (element.attr('dnd-nodrag') !== undefined && !event._dndHandle) return false;
103+
100104
// Initialize global state.
101105
dndState.isDragging = true;
102106
dndState.itemType = attr.dndType && scope.$eval(attr.dndType).toLowerCase();

0 commit comments

Comments
 (0)