Skip to content

Commit 6edc513

Browse files
committed
Merge pull request angular-dragdrop#95 from pumatiger/master
Need for sending custom data on dragOver, dragLeave and dragEnter events
2 parents 8a5159d + 65bfaa5 commit 6edc513

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

draganddrop.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ angular.module("ang-drag-drop",[])
119119
e.dataTransfer.setData("dataToSend", sendData);
120120
currentData = angular.fromJson(sendData);
121121
e.dataTransfer.effectAllowed = "copyMove";
122-
$rootScope.$broadcast("ANGULAR_DRAG_START", sendChannel, sendData);
122+
$rootScope.$broadcast("ANGULAR_DRAG_START", sendChannel, currentData.data);
123123
}
124124
else {
125125
e.preventDefault();
@@ -150,6 +150,11 @@ angular.module("ang-drag-drop",[])
150150
e.stopPropagation();
151151
}
152152

153+
var fn = $parse(attr.uiOnDragOver);
154+
scope.$apply(function () {
155+
fn(scope, {$event: e, $channel: dropChannel});
156+
});
157+
153158
e.dataTransfer.dropEffect = e.shiftKey ? 'copy' : 'move';
154159
return false;
155160
}
@@ -170,6 +175,11 @@ angular.module("ang-drag-drop",[])
170175
});
171176
element.removeClass(dragHoverClass);
172177
}
178+
179+
var fn = $parse(attr.uiOnDragLeave);
180+
scope.$apply(function () {
181+
fn(scope, {$event: e, $channel: dropChannel});
182+
});
173183
}
174184

175185
function onDragEnter(e) {
@@ -182,6 +192,11 @@ angular.module("ang-drag-drop",[])
182192
}
183193
dragging++;
184194

195+
var fn = $parse(attr.uiOnDragEnter);
196+
scope.$apply(function () {
197+
fn(scope, {$event: e, $channel: dropChannel});
198+
});
199+
185200
$rootScope.$broadcast("ANGULAR_HOVER", dragChannel);
186201
scope.$apply(function () {
187202
customDragLeaveEvent(scope, {$event: e});

0 commit comments

Comments
 (0)