mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly handle sync errors thrown from Zotero.HTTP.promise()

Browse source
This commit is contained in:
Dan Stillman 2013-03-12 19:58:31 -04:00
parent fe3ad1883d
commit 0cd3a34e14
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -628,7 +628,7 @@ Zotero.Sync.Runner = new function () {
this.warning = function (e) { this.warning = function (e) {
Zotero.debug(e, 2); Zotero.debug(e, 2);
Components.utils.reportError(e); Components.utils.reportError(e);
e.status = 'warning'; e.errorMode = 'warning';
_warning = e; _warning = e;
} }
@ -636,7 +636,7 @@ Zotero.Sync.Runner = new function () {
this.error = function (e) { this.error = function (e) {
if (typeof e == 'string') { if (typeof e == 'string') {
e = new Error(e); e = new Error(e);
e.status = 'error'; e.errorMode = 'error';
} }
Zotero.debug(e, 1); Zotero.debug(e, 1);
Zotero.Sync.Runner.setSyncIcon(e); Zotero.Sync.Runner.setSyncIcon(e);
@ -774,7 +774,7 @@ Zotero.Sync.Runner = new function () {
errors = [this.parseSyncError(e) for each(e in errors)]; errors = [this.parseSyncError(e) for each(e in errors)];
// Set highest priority error as the primary (sync error icon) // Set highest priority error as the primary (sync error icon)
var statusPriorities = { var errorModes = {
info: 1, info: 1,
warning: 2, warning: 2,
error: 3, error: 3,
@ -785,11 +785,11 @@ Zotero.Sync.Runner = new function () {
}; };
var primaryError = false; var primaryError = false;
for each(var error in errors) { for each(var error in errors) {
if (!error.status || statusPriorities[error.status] == -1) { if (!error.errorMode || errorModes[error.errorMode] == -1) {
continue; continue;
} }
if (!primaryError || statusPriorities[error.status] if (!primaryError || errorModes[error.errorMode]
> statusPriorities[primaryError.status]) { > errorModes[primaryError.errorMode]) {
primaryError = error; primaryError = error;
} }
} }
@ -804,7 +804,7 @@ Zotero.Sync.Runner = new function () {
e = this.parseSyncError(e); e = this.parseSyncError(e);
if (Zotero.Sync.Server.upgradeRequired) { if (Zotero.Sync.Server.upgradeRequired) {
e.status = 'upgrade'; e.errorMode = 'upgrade';
Zotero.Sync.Server.upgradeRequired = false; Zotero.Sync.Server.upgradeRequired = false;
} }
@ -843,9 +843,9 @@ Zotero.Sync.Runner = new function () {
var syncIcon = doc.getElementById('zotero-tb-sync'); var syncIcon = doc.getElementById('zotero-tb-sync');
// Update sync icon state // Update sync icon state
syncIcon.setAttribute('status', e.status ? e.status : ""); syncIcon.setAttribute('status', e.errorMode ? e.errorMode : "");
// Disable button while spinning // Disable button while spinning
syncIcon.disabled = e.status == 'animate'; syncIcon.disabled = e.errorMode == 'animate';
} }
// Clear status // Clear status
@ -878,7 +878,7 @@ Zotero.Sync.Runner = new function () {
// In addition to actual errors, string states (e.g., 'animate') // In addition to actual errors, string states (e.g., 'animate')
// can be passed // can be passed
if (typeof e == 'string') { if (typeof e == 'string') {
parsed.status = e; parsed.errorMode = e;
return parsed; return parsed;
} }
@ -890,7 +890,7 @@ Zotero.Sync.Runner = new function () {
if (typeof e.libraryID != 'undefined') { if (typeof e.libraryID != 'undefined') {
parsed.libraryID = e.libraryID; parsed.libraryID = e.libraryID;
} }
parsed.status = e.status ? e.status : 'error'; parsed.errorMode = e.errorMode ? e.errorMode : 'error';
if (e.data) { if (e.data) {
if (e.data.dialogText) { if (e.data.dialogText) {
@ -927,14 +927,14 @@ Zotero.Sync.Runner = new function () {
// TEMP: for now, use the first error // TEMP: for now, use the first error
var e = this.getPrimaryError(errors); var e = this.getPrimaryError(errors);
if (!e.status) { if (!e.errorMode) {
icon.hidden = true; icon.hidden = true;
icon.onclick = null; icon.onclick = null;
return; return;
} }
icon.hidden = false; icon.hidden = false;
icon.setAttribute('mode', e.status); icon.setAttribute('mode', e.errorMode);
icon.onclick = function () { icon.onclick = function () {
var doc = this.ownerDocument; var doc = this.ownerDocument;
@ -972,7 +972,7 @@ Zotero.Sync.Runner = new function () {
// If not an error and there's no explicit button text, don't show // If not an error and there's no explicit button text, don't show
// button to report errors // button to report errors
if (e.status != 'error' && typeof e.buttonText == 'undefined') { if (e.errorMode != 'error' && typeof e.buttonText == 'undefined') {
e.buttonText = null; e.buttonText = null;
} }