Merge branch 'fix-ie-text' into master-angular-gantt

Toilal · Toilal · commit a128ac04fb70 · 2015-03-14T07:47:06.000+01:00
diff --git a/draganddrop.js b/draganddrop.js
@@ -112,7 +112,7 @@ angular.module("ang-drag-drop",[])
 				            });
 			            }
 
-			            e.dataTransfer.setData("dataToSend", sendData);
+			            e.dataTransfer.setData("text", sendData);
 			            currentData = angular.fromJson(sendData);
 			            e.dataTransfer.effectAllowed = "copyMove";
 			            $rootScope.$broadcast("ANGULAR_DRAG_START", sendChannel, currentData.data);
@@ -214,7 +214,7 @@ angular.module("ang-drag-drop",[])
                         e.stopPropagation(); // Necessary. Allows us to drop.
                     }
 
-                    var sendData = e.dataTransfer.getData("dataToSend");
+                    var sendData = e.dataTransfer.getData("text");
                     sendData = angular.fromJson(sendData);
 
                     // Chrome doesn't set dropEffect, so we have to work it out ourselves

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ angular.module("ang-drag-drop",[])`
`112`	`112`	`});`
`113`	`113`	`}`
`114`	`114`
`115`		`- e.dataTransfer.setData("dataToSend", sendData);`
	`115`	`+ e.dataTransfer.setData("text", sendData);`
`116`	`116`	`currentData = angular.fromJson(sendData);`
`117`	`117`	`e.dataTransfer.effectAllowed = "copyMove";`
`118`	`118`	`$rootScope.$broadcast("ANGULAR_DRAG_START", sendChannel, currentData.data);`
`@@ -214,7 +214,7 @@ angular.module("ang-drag-drop",[])`
`214`	`214`	`e.stopPropagation(); // Necessary. Allows us to drop.`
`215`	`215`	`}`
`216`	`216`
`217`		`- var sendData = e.dataTransfer.getData("dataToSend");`
	`217`	`+ var sendData = e.dataTransfer.getData("text");`
`218`	`218`	`sendData = angular.fromJson(sendData);`
`219`	`219`
`220`	`220`	`// Chrome doesn't set dropEffect, so we have to work it out ourselves`