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

Fix state check errors (middle-pane restart messages) during syncing

Browse source 
The state check errors were caused by 4812ab6f, which was a fix for
"Q.async(...)(...) is undefined" errors caused by ad8b81f4c, which was a
fix for "too much recursion" errors related to Task.spawn() on Windows
with JIT enabled.
This commit is contained in:
Dan Stillman 2014-10-05 12:03:50 -04:00
parent 72bb8acfd1
commit 71bd1a7f99
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
chrome/content/zotero/xpcom/sync.js
View file

@ -1627,7 +1627,7 @@ Zotero.Sync.Server = new function () {
_error(e); _error(e);
} }
Q.async(Zotero.Sync.Server.Data.processUpdatedXML( var result = Q.async(Zotero.Sync.Server.Data.processUpdatedXML(
responseNode.getElementsByTagName('updated')[0], responseNode.getElementsByTagName('updated')[0],
lastLocalSyncDate, lastLocalSyncDate,
syncSession, syncSession,
@ -1836,13 +1836,11 @@ Zotero.Sync.Server = new function () {
Zotero.HTTP.doPost(url, body, uploadCallback); Zotero.HTTP.doPost(url, body, uploadCallback);
} }
} }
))() ))();
.then(
null, if (Q.isPromise(result)) {
function (e) { result.catch(errorHandler);
errorHandler(e); }
}
);
} }
catch (e) { catch (e) {
_error(e); _error(e);
@ -2676,8 +2674,6 @@ Zotero.Sync.Server.Data = new function() {
this.processUpdatedXML = function (updatedNode, lastLocalSyncDate, syncSession, defaultLibraryID, callback) { this.processUpdatedXML = function (updatedNode, lastLocalSyncDate, syncSession, defaultLibraryID, callback) {
yield true;
updatedNode.xpath = function (path) { updatedNode.xpath = function (path) {
return Zotero.Utilities.xpath(this, path); return Zotero.Utilities.xpath(this, path);
}; };