www

commit e239b69d76feb94fdceb73203cc64090402a6f0e
parent b6964dc00fa193deb928a40a9bc89e0c106aeb56
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 23 Sep 2009 06:59:43 +0000

- Restore error icon if WebDAV verification fails during sync and settings are filled in
- Display slightly more helpful message on unknown error
- Missing file from previous commit


Diffstat:
M
chrome/content/zotero/xpcom/storage.js
 | 
3
++-
M
chrome/content/zotero/xpcom/storage/session.js
 | 
4
++--
M
chrome/content/zotero/xpcom/storage/webdav.js
 | 
4
++++

3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
@@ -99,7 +99,8 @@ Zotero.Sync.Storage = new function () {
 				}
 				else {
 					Zotero.debug(_session.name + " verification failed");
-					_callbacks.onSkip();
+					_callbacks.onError(_session.name + " verification failed. Verify your "
+						+ "WebDAV settings in the Sync pane of the Zotero preferences.");
 				}
 			}
 			
diff --git a/chrome/content/zotero/xpcom/storage/session.js b/chrome/content/zotero/xpcom/storage/session.js
@@ -138,9 +138,9 @@ Zotero.Sync.Storage.Session.prototype.checkServer = function (callback) {
 	}
 }
 
-Zotero.Sync.Storage.Session.prototype.checkServerCallback = function (uri, status, authRequired, window, skipSuccessMessage) {
+Zotero.Sync.Storage.Session.prototype.checkServerCallback = function (uri, status, authRequired, window, skipSuccessMessage, error) {
 	try {
-		return this._session.checkServerCallback(uri, status, authRequired, window, skipSuccessMessage);
+		return this._session.checkServerCallback(uri, status, authRequired, window, skipSuccessMessage, error);
 	}
 	catch (e) {
 		this.onError(e);
diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -1027,6 +1027,10 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri
 			});
 			
 			return false;
+		
+		case Zotero.Sync.Storage.ERROR_UNKNOWN:
+			var errorMessage = "An unknown error occurred. Check your WebDAV settings and server configuration.";
+			break;
 	}
 	
 	if (!skipSuccessMessage) {