www

commit 884132ac8bd22bf2090aecf8c9fbb8bc149f1d0d
parent 5a1d605330a555ae586a875fd2a37be876975059
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 11 Feb 2015 01:18:48 -0500

Merge pull request #629 from aurimasv/varDump-exception

Handle XPCOM Exceptions in varDump
Diffstat:
M
chrome/content/zotero/xpcom/utilities.js
 | 
17
+++++++++++++----

1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
@@ -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) : '')