- Fix sync error with empty WebDAV URL
- Fix Verify Server hang with empty WebDAV URL
This commit is contained in:
parent
e828ea6fa6
commit
abf53e07ce
2 changed files with 8 additions and 5 deletions
|
@ -79,7 +79,9 @@ Zotero.Sync.Storage = new function () {
|
|||
return;
|
||||
}
|
||||
if (!_session.initFromPrefs()) {
|
||||
_error("Module not initialized");
|
||||
Zotero.debug(_session.name + " module not initialized");
|
||||
_callbacks.onSkip();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_session.active) {
|
||||
|
@ -639,10 +641,8 @@ Zotero.Sync.Storage = new function () {
|
|||
|
||||
|
||||
this.checkServer = function (module, callback) {
|
||||
_session = new Zotero.Sync.Storage.Session(module, { onError: _error });
|
||||
if (!_session.initFromPrefs()) {
|
||||
_error("Module not initialized");
|
||||
}
|
||||
_session = new Zotero.Sync.Storage.Session(module, { onError: callback });
|
||||
_session.initFromPrefs();
|
||||
_session.checkServer(callback);
|
||||
}
|
||||
|
||||
|
|
|
@ -163,6 +163,9 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.initFromPrefs = function () {
|
|||
}
|
||||
|
||||
var url = Zotero.Prefs.get('sync.storage.url');
|
||||
if (!url) {
|
||||
return false;
|
||||
}
|
||||
|
||||
url = scheme + '://' + url;
|
||||
var dir = "zotero";
|
||||
|
|
Loading…
Reference in a new issue