mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix https://forums.zotero.org/discussion/28922/

Browse source
This commit is contained in:
Simon Kornblith 2013-04-17 02:35:44 -04:00
parent 91b2de3ec6
commit de2dec921f
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
chrome/content/zotero/xpcom/server_connector.js
View file

@ -55,6 +55,14 @@ Zotero.Server.Connector.AttachmentProgressManager = new function() {
this.getProgressForID = function(progressID) { this.getProgressForID = function(progressID) {
return progressID in attachmentProgress ? attachmentProgress[progressID] : 0; return progressID in attachmentProgress ? attachmentProgress[progressID] : 0;
}; };
/**
* Check if we have received progress for a given attachment
*/
this.has = function(attachment) {
return attachmentsInProgress.has(attachment)
&& attachmentsInProgress.get(attachment) in attachmentProgress;
}
}; };
/** /**
@ -339,11 +347,21 @@ Zotero.Server.Connector.SaveItem.prototype = {
// save items // save items
var itemSaver = new Zotero.Translate.ItemSaver(libraryID, var itemSaver = new Zotero.Translate.ItemSaver(libraryID,
Zotero.Translate.ItemSaver.ATTACHMENT_MODE_DOWNLOAD, 1, undefined, cookieSandbox); Zotero.Translate.ItemSaver.ATTACHMENT_MODE_DOWNLOAD, 1, undefined, cookieSandbox);
itemSaver.saveItems(data.items, function(returnValue, newItems) { itemSaver.saveItems(data.items, function(returnValue, items) {
if(returnValue) { if(returnValue) {
try { try {
for each(var item in newItems) { // Remove attachments not being saved from item.attachments
if(collection) collection.addItem(item.id); for(var i=0; i<data.items.length; i++) {
var item = data.items[i];
for(var j=0; j<item.attachments.length; j++) {
if(!Zotero.Server.Connector.AttachmentProgressManager.has(item.attachments[j])) {
item.attachments.splice(j--, 1);
}
}
}
for(var i=0; i<items.length; i++) {
if(collection) collection.addItem(items[i].id);
} }
sendResponseCallback(201, "application/json", JSON.stringify({"items":data.items})); sendResponseCallback(201, "application/json", JSON.stringify({"items":data.items}));