www

commit 310ff1cf53058de2a78e277ca7ac0598cc6797b2
parent 4dd56eadfca9b89e1728661776407337bb823ebd
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 28 Sep 2015 20:28:38 -0400

Merge branch 'connector' into 4.0

Diffstat:
M
chrome/content/zotero/xpcom/connector/translate_item.js
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/connector/translate_item.js b/chrome/content/zotero/xpcom/connector/translate_item.js
@@ -174,13 +174,14 @@ Zotero.Translate.ItemSaver.prototype = {
 	 *     attachmentCallback() will be called with all attachments that will be saved 
 	 */
 	"_saveToServer":function(items, callback, attachmentCallback) {
-		var newItems = [], typedArraysSupported = false;
+		var newItems = [], itemIndices = [], typedArraysSupported = false;
 		try {
 			typedArraysSupported = !!(new Uint8Array(1) && new Blob());
 		} catch(e) {}
 		
 		for(var i=0, n=items.length; i<n; i++) {
 			var item = items[i];
+			itemIndices[i] = newItems.length;
 			newItems = newItems.concat(Zotero.Utilities.itemToServerJSON(item));
 			if(typedArraysSupported) {
 				for(var j=0; j<item.attachments.length; j++) {
@@ -214,9 +215,8 @@ Zotero.Translate.ItemSaver.prototype = {
 			function(prefs) {
 
 				if(typedArraysSupported) {
-					Zotero.debug(response);
-					for(var i in resp.success) {
-						var item = items[i], key = resp.success[i];
+					for(var i=0; i<items.length; i++) {
+						var item = items[i], key = resp.success[itemIndices[i]];
 						if(item.attachments && item.attachments.length) {
 							me._saveAttachmentsToServer(key, me._getFileBaseNameFromItem(item),
 								item.attachments, prefs, attachmentCallback);