suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Verify Server error display

Browse Source
This commit is contained in:
Dan Stillman 2011-12-17 16:46:21 -05:00
parent 059460a5d2
commit ab9545688f
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/preferences/preferences.js
View File

@ -322,7 +322,7 @@ function verifyStorageServer() {
abortButton.hidden = false;
progressMeter.hidden = false;
var requestHolder = Zotero.Sync.Storage.checkServer('webdav', function (uri, status, callback) {
var requestHolder = Zotero.Sync.Storage.checkServer('WebDAV', function (uri, status, callback) {
verifyButton.hidden = false;
abortButton.hidden = true;
progressMeter.hidden = true;

17
chrome/content/zotero/xpcom/storage.js
View File

@ -826,12 +826,17 @@ Zotero.Sync.Storage = new function () {
onSuccess: function () {},
onError: function (e) {
Zotero.debug(e, 1);
callback(null, null, e);
throw (e);
callback(null, null, function () {
// If there's an error, just display that
Zotero.Utilities.Internal.errorPrompt(Zotero.getString('general.error'), e);
});
return true;
}
});
}, false, "checkServer");
return module.checkServer(function (uri, status) {
callback(uri, status, module.checkServerCallback);
callback(uri, status, function () {
module.checkServerCallback(uri, status);
});
});
}
@ -845,7 +850,7 @@ Zotero.Sync.Storage = new function () {
onError: function (e) {
error(e);
}
});
}, false, "purgeDeletedStorageFiles");
module.purgeDeletedStorageFiles(callback);
}
@ -859,7 +864,7 @@ Zotero.Sync.Storage = new function () {
onError: function (e) {
error(e);
}
});
}, false, "purgeOrphanedStorageFiles");
module.purgeOrphanedStorageFiles(callback);
}

2
chrome/content/zotero/xpcom/storage/module.js
View File

@ -163,7 +163,7 @@ Zotero.Sync.Storage.Module.prototype.checkServer = function (callback) {
Zotero.Sync.Storage.Module.prototype.checkServerCallback = function (uri, status, window, skipSuccessMessage) {
try {
return this._module.checkServerCallback(uri, status, authRequired, window, skipSuccessMessage);
return this._module.checkServerCallback(uri, status, window, skipSuccessMessage);
}
catch (e) {
Zotero.Sync.Storage.EventManager.error(e);