Fix: drag not working if onDrop undefined

Servoy · Jul 7, 2021 · 510e5e8 · 510e5e8
1 parent 2c6e520
commit 510e5e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/customrenderedcomponents/customlist/customlist.js b/customrenderedcomponents/customlist/customlist.js
@@ -196,6 +196,11 @@ angular.module('customrenderedcomponentsCustomlist',['servoy'])
 						pull: $scope.model.dragEnabled, // can drag into other lists
 						put: $scope.model.dropEnabled, // can drop from other lists
 					};
+
+					// copy data upon drag
+					if ($scope.model.dragEnabled) {
+						opts.setData = setData;
+					}
 
 					// group name
 					if ($scope.model.dragEnabled || $scope.model.dropEnabled) {
@@ -228,7 +233,6 @@ angular.module('customrenderedcomponentsCustomlist',['servoy'])
 					// opts.onChoose = onChoose;
 
 					if ($scope.handlers.onDrop) {
-						opts.setData = setData;
 						opts.onAdd = onAdd;
 						opts.onRemove = onRemove;
 					}

diff --git a/customrenderedcomponents/foundsetlist/foundsetlist.js b/customrenderedcomponents/foundsetlist/foundsetlist.js
@@ -338,6 +338,11 @@ angular.module('customrenderedcomponentsFoundsetlist', ['servoy'])
 							pull: $scope.model.dragEnabled, // can drag into other lists
 							put: $scope.model.dropEnabled, // can drop from other lists
 						};
+
+						// copy data upon drag
+						if ($scope.model.dragEnabled) {
+							opts.setData = setData;
+						}
 
 						// group name
 						if ($scope.model.dragEnabled || $scope.model.dropEnabled) {
@@ -363,7 +368,6 @@ angular.module('customrenderedcomponentsFoundsetlist', ['servoy'])
 
 						/** Events */
 						if ($scope.handlers.onDrop) {
-							opts.setData = setData;
 							opts.onAdd = onAdd;
 						}