fixed issue with drag bubbling and active drop elements #1629

luyadev · Nov 13, 2017 · e90c096 · e90c096
1 parent 9801261
commit e90c096
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/modules/admin/src/resources/dist/js/main.js b/modules/admin/src/resources/dist/js/main.js
@@ -9241,6 +9241,7 @@ angular.module('dnd', [])
  e.dataTransfer.dropEffect = 'move';
  // allows us to drop
  if (e.preventDefault) { e.preventDefault(); }
+ if (e.stopPropagation) { e.stopPropagation(); }
  if (!scope.dndIsvalid({hover: scope.dndModel, dragged: dndFactory.get().content})) {
  e.stopPropagation();
  e.preventDefault();

diff --git a/modules/admin/src/resources/js/dnd.js b/modules/admin/src/resources/js/dnd.js
@@ -99,6 +99,7 @@ angular.module('dnd', [])
  e.dataTransfer.dropEffect = 'move';
  // allows us to drop
  if (e.preventDefault) { e.preventDefault(); }
+ if (e.stopPropagation) { e.stopPropagation(); }
  if (!scope.dndIsvalid({hover: scope.dndModel, dragged: dndFactory.get().content})) {
  e.stopPropagation();
  e.preventDefault();