misc exception handling improvements

[tt-rss.git] / functions.js

diff --git a/functions.js b/functions.js
index f82708b29754b00bb473b50e7e4bdfbec88ebfaf..53cee530918a7b2bf72e496eaa46367f5302565e 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1,8 +1,19 @@
 var hotkeys_enabled = true;
 
 function exception_error(location, e) {
-       alert("Exception: " + e.name + "\nMessage: " + e.message + 
-               "\nLocation: " + location);
+       var msg;
+
+       if (e.fileName) {
+               var base_fname = e.fileName.substring(e.fileName.lastIndexOf("/") + 1);
+       
+               msg = "Exception: " + e.name + ", " + e.message + 
+                       "\nFunction: " + location + "()" +
+                       "\nLocation: " + base_fname + ":" + e.lineNumber;
+       } else {
+               msg = "Exception: " + e + "\nFunction: " + location + "()";
+       }
+
+       alert(msg);
 }
 
 function disableHotkeys() {
@@ -133,7 +144,7 @@ function hotkey_handler(e) {
                try {
                        localHotkeyHandler(keycode);
                } catch (e) {
-                       exception_error(e);
+                       exception_error("hotkey_handler", e);
                }
        }
 
@@ -395,7 +406,7 @@ function parse_counters(reply, f_document) {
                        }
                }
        } catch (e) {
-               exception_error(e);
+               exception_error("parse_counters", e);
        }
 }