scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-19 00:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Better sync error message for Firefox offline mode

Browse source 
- Better sync error message for "Sync already running in Zotero.Sync.Runner.sync()"
- Remove "Report Error..." button for manual intervention message
This commit is contained in:
Dan Stillman 2010-03-01 20:00:34 +00:00
parent 5586eae237
commit ab1983ebf2
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
chrome/content/zotero/xpcom/sync.js
View file

@ -505,12 +505,19 @@ Zotero.Sync.Runner = new function () {
if (Zotero.Utilities.HTTP.browserIsOffline()){
this.clearSyncTimeout(); // DEBUG: necessary?
this.setSyncIcon('error', "Browser is offline");
var msg = "Zotero cannot sync while Firefox is in offline mode.";
var e = new Zotero.Error(msg, 0, { dialogButtonText: null })
this.setSyncIcon('error', e);
return false;
}
if (_running) {
throw ("Sync already running in Zotero.Sync.Runner.sync()");
// TODO: show status in all windows
var msg = "A sync process is already running. To view progress, check "
+ "the window in which the sync began or restart Firefox.";
var e = new Zotero.Error(msg, 0, { dialogButtonText: null })
this.setSyncIcon('error', e);
return false;
}
// Purge deleted objects so they don't cause sync errors (e.g., long tags)
@ -1048,9 +1055,8 @@ Zotero.Sync.Server = new function () {
this.__defineGetter__('password', function () {
var username = this.username;
if (!username) {
Zotero.debug('Username not set before setting Zotero.Sync.Server.password');
return '';
}
@ -2760,11 +2766,11 @@ Zotero.Sync.Server.Data = new function() {
if (Zotero.Sync.Runner.background) {
Zotero.Sync.Server.manualSyncRequired = true;
throw (
Zotero.getString('sync.error.manualInterventionRequired')
var msg = Zotero.getString('sync.error.manualInterventionRequired')
+ "\n\n"
+ Zotero.getString('sync.error.clickSyncIcon')
);
+ Zotero.getString('sync.error.clickSyncIcon');
var e = new Zotero.Error(msg, 0, { dialogButtonText: null });
throw (e);
}
var mergeData = _reconcile(type, toReconcile, remoteCreatorStore);