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

Display more helpful message for "Username not set" error when clicking on the sync error icon (previously displayed a full message at sync time for foreground syncs but updated the error icon dialog only for background syncs)

Browse Source
This commit is contained in:
Dan Stillman 2011-10-12 15:23:53 +00:00
parent 456406fc10
commit 749b4ee464
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
chrome/content/zotero/xpcom/sync.js
View File

@ -2261,21 +2261,18 @@ Zotero.Sync.Server = new function () {
// instead of creating its own dialog, but setSyncIcon() doesn't yet provide full control // instead of creating its own dialog, but setSyncIcon() doesn't yet provide full control
// over dialog title and primary button text/action, which is why this version of the // over dialog title and primary button text/action, which is why this version of the
// dialog is a bit uglier than the manual click version // dialog is a bit uglier than the manual click version
if (Zotero.Sync.Runner.background) { // TODO: localize and combine with below
// TODO: localize and combine with below var msg = "The Zotero sync server did not accept your username and password.\n\n"
var msg = "The Zotero sync server did not accept your username and password.\n\n" + "Please check that you have entered your zotero.org login information correctly in the Zotero sync preferences.";
+ "Please check that you have entered your zotero.org login information correctly in the Zotero sync preferences."; e.data = {};
e.data = {}; e.data.dialogText = msg;
e.data.dialogText = msg; e.data.dialogButtonText = Zotero.getString('sync.openSyncPreferences');
e.data.dialogButtonText = Zotero.getString('sync.openSyncPreferences'); e.data.dialogButtonCallback = function () {
e.data.dialogButtonCallback = function () { var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator);
.getService(Components.interfaces.nsIWindowMediator); var win = wm.getMostRecentWindow("navigator:browser");
var win = wm.getMostRecentWindow("navigator:browser"); win.ZoteroPane.openPreferences("zotero-prefpane-sync");
win.ZoteroPane.openPreferences("zotero-prefpane-sync"); };
};
break;
}
// Manual click // Manual click
setTimeout(function () { setTimeout(function () {