www

commit 905c754b6b1b11cd10a645057a68710884673452
parent 856fb80fd6d8259cf31dfbc000e35b4b54b6e5fa
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun,  7 Mar 2010 08:57:40 +0000

Stop sync icon spinning on reset completion


Diffstat:
M
chrome/content/zotero/preferences/preferences.js
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
@@ -437,12 +437,13 @@ function handleSyncReset(action) {
 					Zotero.Sync.Server.clear(function () {
 						Zotero.Sync.Server.sync({
 							onSuccess: function () {
+								Zotero.Sync.Runner.setSyncIcon();
 								pr.alert(
 									"Restore Completed",
 									"Data on the Zotero server has been successfully restored."
 								);
 							},
-							onError: function () {
+							onError: function (msg) {
 								// TODO: combine with error dialog for regular syncs
 								pr.alert(
 									"Restore Failed",
@@ -450,6 +451,7 @@ function handleSyncReset(action) {
 										+ "Click the sync error icon in the Zotero toolbar "
 										+ "for further information."
 								);
+								Zotero.Sync.Runner.error(msg);
 							}
 						});
 					});
@@ -483,12 +485,13 @@ function handleSyncReset(action) {
 					Zotero.Sync.Server.resetClient();
 					Zotero.Sync.Server.sync({
 						onSuccess: function () {
+							Zotero.Sync.Runner.setSyncIcon();
 							pr.alert(
 								"Full Sync Completed",
 								"The local Zotero library has been merged with data from the Zotero server."
 							);
 						},
-						onError: function () {
+						onError: function (msg) {
 							// TODO: combine with error dialog for regular syncs
 							pr.alert(
 								"Full Sync Failed",
@@ -496,6 +499,7 @@ function handleSyncReset(action) {
 									+ "Click the sync error icon in the Zotero toolbar "
 									+ "for further information."
 							);
+							Zotero.Sync.Runner.error(msg);
 						}
 					});
 					break;