From 82e3cfd288677d5dcebcc1505dcb3610ba68ecfd Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 17 Mar 2010 07:55:36 +0000 Subject: [PATCH] Disable Reset feedback, since it causes endless sync icon spinning if the pref window is closed --- chrome/content/zotero/preferences/preferences.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js index 9e8f58ba1..86c474cd2 100644 --- a/chrome/content/zotero/preferences/preferences.js +++ b/chrome/content/zotero/preferences/preferences.js @@ -440,7 +440,12 @@ function handleSyncReset(action) { case 0: // TODO: better error handling Zotero.Sync.Server.clear(function () { - Zotero.Sync.Server.sync({ + Zotero.Sync.Server.sync(/*{ + + // TODO: this doesn't work if the pref window is + closed. fix, perhaps by making original callbacks + available to the custom callbacks + onSuccess: function () { Zotero.Sync.Runner.setSyncIcon(); pr.alert( @@ -458,7 +463,7 @@ function handleSyncReset(action) { ); Zotero.Sync.Runner.error(msg); } - }); + }*/); }); break; @@ -488,7 +493,7 @@ function handleSyncReset(action) { case 0: // TODO: better error handling Zotero.Sync.Server.resetClient(); - Zotero.Sync.Server.sync({ + Zotero.Sync.Server.sync(/*{ onSuccess: function () { Zotero.Sync.Runner.setSyncIcon(); pr.alert( @@ -506,7 +511,7 @@ function handleSyncReset(action) { ); Zotero.Sync.Runner.error(msg); } - }); + }*/); break; // Cancel