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

Merge pull request #629 from aurimasv/varDump-exception

Browse Source 
Handle XPCOM Exceptions in varDump
This commit is contained in:
Dan Stillman 2015-02-11 01:18:48 -05:00
commit 884132ac8b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chrome/content/zotero/xpcom/utilities.js
View File

@ -1217,9 +1217,10 @@ Zotero.Utilities = {
level_padding += " ";
}
//Special handling for Error
//Special handling for Error or Exception
var isException = Zotero.isFx && !Zotero.isBookmarklet && obj instanceof Components.interfaces.nsIException;
var isError = obj instanceof Error;
if (!isError && obj.constructor) {
if (!isException && !isError && obj.constructor && obj.stack) {
switch (obj.constructor.name) {
case 'Error':
case 'EvalError':
@ -1231,8 +1232,16 @@ Zotero.Utilities = {
isError = true;
}
}
if (isError) {
return (obj.constructor.name ? obj.constructor.name : 'Error') + ': '
if (isError || isException) {
var header = '';
if (isError) {
header = obj.constructor.name ? obj.constructor.name : 'Error';
} else {
header = (obj.name ? obj.name + ' ' : '') + 'Exception';
}
return header + ': '
+ (obj.message ? ('' + obj.message).replace(/^/gm, level_padding).trim() : '')
+ '\n' + level_padding + "===== Stack Trace =====\n"
+ (obj.stack ? obj.stack.trim().replace(/^(?=.)/gm, level_padding) : '')