www

commit a0b3c1f6ac7c4737a3b745f26ed3ae7a57e2ea33
parent b599aed8eda595ee5c7f4cc54df4c11f2eed886c
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 10 Apr 2015 21:40:44 -0400

Merge pull request #698 from aurimasv/patch-1

More informative error messages for failed file loads
Diffstat:
M
components/zotero-service.js
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/components/zotero-service.js b/components/zotero-service.js
@@ -328,8 +328,10 @@ function ZoteroService() {
 		
 		zContext.Zotero.debug("Initialized in "+(Date.now() - start)+" ms");
 	} catch(e) {
-		var msg = typeof e == 'string' ? e : e.name;
-		dump(e + "\n\n");
+		var msg = e instanceof Error
+			? e.name + ': ' + e.message + '\n' + e.fileName + ':' + e.lineNumber + '\n' + e.stack
+			: '' + e;
+		dump(msg + '\n');
 		Components.utils.reportError(e);
 		throw e;
 	}
@@ -475,4 +477,4 @@ if (XPCOMUtils.generateNSGetFactory) {
 	var NSGetFactory = XPCOMUtils.generateNSGetFactory([ZoteroService, ZoteroCommandLineHandler]);
 } else {
 	var NSGetModule = XPCOMUtils.generateNSGetModule([ZoteroService, ZoteroCommandLineHandler]);
-}
-\ No newline at end of file
+}