Merge git://github.com/Gared/etherpad-lite into develop

1 files changed, 15 insertions, 6 deletions

diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js
index 8f7347bf..83ee9aae 100644
--- a/src/static/js/pad_utils.js
+++ b/src/static/js/pad_utils.js
@@ -502,17 +502,26 @@ var padutils = {
 
 var globalExceptionHandler = undefined;
 function setupGlobalExceptionHandler() {
-  //send javascript errors to the server
   if (!globalExceptionHandler) {
     globalExceptionHandler = function test (msg, url, linenumber)
     {
-     var errObj = {errorInfo: JSON.stringify({msg: msg, url: url, linenumber: linenumber, userAgent: navigator.userAgent})};
-     var loc = document.location;
-     var url = loc.protocol + "//" + loc.hostname + ":" + loc.port + "/" + loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "jserror";
+      var errorId = randomString(20);
+      if ($("#editorloadingbox").attr("display") != "none"){
+        //show javascript errors to the user
+        $("#editorloadingbox").css("padding", "10px");
+        $("#editorloadingbox").css("padding-top", "45px");
+        $("#editorloadingbox").html("<div style='text-align:left;color:red;font-size:16px;'><b>An error occured</b><br>The error was reported with the following id: '" + errorId + "'<br><br><span style='color:black;font-weight:bold;font-size:16px'>Please send this error message to us: </span><div style='color:black;font-size:14px'>'"
+          + "ErrorId: " + errorId + "<br>UserAgent: " + navigator.userAgent + "<br>" + msg + " in " + url + " at line " + linenumber + "'</div></div>");
+      }
+
+      //send javascript errors to the server
+      var errObj = {errorInfo: JSON.stringify({errorId: errorId, msg: msg, url: url, linenumber: linenumber, userAgent: navigator.userAgent})};
+      var loc = document.location;
+      var url = loc.protocol + "//" + loc.hostname + ":" + loc.port + "/" + loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "jserror";
  
-     $.post(url, errObj);
+      $.post(url, errObj);
  
-     return false;
+      return false;
     };
     window.onerror = globalExceptionHandler;
   }