From 23693a1312872f995af90229a7812b4a71e2b625 Mon Sep 17 00:00:00 2001 From: benxshen Date: Tue, 3 Apr 2018 07:56:10 +0800 Subject: [PATCH] merge the pull-request: do not start drag if dnd-nodrag && no dnd-handle #432 https://github.com/marceljuenemann/angular-drag-and-drop-lists/pull/432 --- angular-drag-and-drop-lists.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/angular-drag-and-drop-lists.js b/angular-drag-and-drop-lists.js index 8a07ce3..c6e4f98 100644 --- a/angular-drag-and-drop-lists.js +++ b/angular-drag-and-drop-lists.js @@ -97,6 +97,10 @@ // Check whether the element is draggable, since dragstart might be triggered on a child. if (element.attr('draggable') == 'false') return true; + // merge the pull-request: do not start drag if dnd-nodrag && no dnd-handle #432 + // https://github.com/marceljuenemann/angular-drag-and-drop-lists/pull/432 + if (element.attr('dnd-nodrag') !== undefined && !event._dndHandle) return false; + // Initialize global state. dndState.isDragging = true; dndState.itemType = attr.dndType && scope.$eval(attr.dndType).toLowerCase();