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

Alter semantics of Zotero.Exception.Alert() so that toString() returns the cause if there is one

Browse Source
This commit is contained in:
Simon Kornblith 2012-07-15 04:14:24 -04:00
parent de2d1669fe
commit 910f698ea2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chrome/content/zotero/xpcom/error.js
View File

@ -98,10 +98,7 @@ Zotero.Exception.Alert.prototype = {
} }
}, },
/** get message() {
* Gets the error string
*/
"toString":function() {
try { try {
return Zotero.getString(this.name, this.params); return Zotero.getString(this.name, this.params);
} catch(e) { } catch(e) {
@ -109,6 +106,13 @@ Zotero.Exception.Alert.prototype = {
} }
}, },
/**
* Gets the error string
*/
"toString":function() {
return this.cause.toString() || this.message;
},
/** /**
* Presents the error in a dialog * Presents the error in a dialog
* @param {DOMWindow} window The window to which the error should be attached * @param {DOMWindow} window The window to which the error should be attached
@ -116,8 +120,8 @@ Zotero.Exception.Alert.prototype = {
"present":function(window) { "present":function(window) {
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
try { try {
Services.prompt.alert(window || null, this.title, this.toString()); Services.prompt.alert(window || null, this.title, this.message);
}catch(e) { } catch(e) {
Zotero.debug(e); Zotero.debug(e);
} }
}, },