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

Fix "this._deferred is null" WebDAV sync error

Browse source 
This occurred if an attachment had only files beginning with periods.
This commit is contained in:
Dan Stillman 2013-04-03 05:22:33 -04:00
parent f9663dc64d
commit 729080db4d
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/storage/queue.js
View file

@ -230,7 +230,12 @@ Zotero.Sync.Storage.Queue.prototype.start = function () {
// The queue manager needs to know what queues were running in the // The queue manager needs to know what queues were running in the
// current session // current session
Zotero.Sync.Storage.QueueManager.addCurrentQueue(this); Zotero.Sync.Storage.QueueManager.addCurrentQueue(this);
this.advance();
var self = this;
setTimeout(function () {
self.advance();
}, 0);
return this._deferred.promise; return this._deferred.promise;
} }

5
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -957,7 +957,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
obj._uploadFile = function (request) { obj._uploadFile = function (request) {
var deferred = Q.defer(); var deferred = Q.defer();
Zotero.Sync.Storage.createUploadFile( var created = Zotero.Sync.Storage.createUploadFile(
request, request,
function (data) { function (data) {
deferred.resolve( deferred.resolve(
@ -967,6 +967,9 @@ Zotero.Sync.Storage.WebDAV = (function () {
); );
} }
); );
if (!created) {
return Q(false);
}
return deferred.promise; return deferred.promise;
}; };