www

commit 28601a4380533f17a244e7d575340e4c2accebc7
parent 8208ece9dfe39f29c84b6d08ce72e75257cc2de2
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 30 Sep 2016 02:58:52 -0400

Merge branch '4.0'

Diffstat:
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
14
+++++---------

1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -2498,7 +2498,7 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event) {
 				Zotero.debug("Adding file via x-moz-file-promise");
 				event.dataTransfer.mozSetDataAt(
 					"application/x-moz-file-promise",
-					new Zotero.ItemTreeView.fileDragDataProvider(),
+					new Zotero.ItemTreeView.fileDragDataProvider(itemIDs),
 					0
 				);
 				break;
@@ -2575,7 +2575,9 @@ Zotero.ItemTreeView.prototype.onDragStart = function (event) {
 // Implements nsIFlavorDataProvider for dragging attachment files to OS
 //
 // Not used on Windows in Firefox 3 or higher
-Zotero.ItemTreeView.fileDragDataProvider = function() { };
+Zotero.ItemTreeView.fileDragDataProvider = function (itemIDs) {
+	this._itemIDs = itemIDs;
+};
 
 Zotero.ItemTreeView.fileDragDataProvider.prototype = {
 	QueryInterface : function(iid) {
@@ -2599,13 +2601,7 @@ Zotero.ItemTreeView.fileDragDataProvider.prototype = {
 			transferable.getTransferData("application/x-moz-file-promise-dir", dirPrimitive, dataSize);
 			var destDir = dirPrimitive.value.QueryInterface(Components.interfaces.nsILocalFile);
 			
-			// Get the items we're dragging
-			var items = {};
-			transferable.getTransferData("zotero/item", items, dataSize);
-			items.value.QueryInterface(Components.interfaces.nsISupportsString);
-			
-			var draggedItems = Zotero.Items.get(items.value.data.split(','));
-			
+			var draggedItems = Zotero.Items.get(this._itemIDs);
 			var items = [];
 			
 			// Make sure files exist