diff options
| author | Stefan <mu.stefan@googlemail.com> | 2016-12-20 21:31:11 +0100 |
|---|---|---|
| committer | Stefan <mu.stefan@googlemail.com> | 2016-12-20 21:31:11 +0100 |
| commit | aefa61779777983fb1ef78d8d3c65e226202a4de (patch) | |
| tree | e39db901f012354652125d7792c9648a288e7375 /src/static/js/pad_utils.js | |
| parent | 009b61b33843a5c03587b7e12e7d411dea0ca51e (diff) | |
| parent | 368bbe48368b74ca701625fa1f182699e984898d (diff) | |
| download | etherpad-lite-aefa61779777983fb1ef78d8d3c65e226202a4de.zip | |
Merge branch 'develop' into improve_cookies
Diffstat (limited to 'src/static/js/pad_utils.js')
| -rw-r--r-- | src/static/js/pad_utils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js index eafa14bb..b83f21cf 100644 --- a/src/static/js/pad_utils.js +++ b/src/static/js/pad_utils.js @@ -523,7 +523,7 @@ function setupGlobalExceptionHandler() { //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 press and hold Ctrl and press F5 to reload this page, if the problem persists please send this error message to your webmaster: </span><div style='color:black;font-size:14px'>'" + $("#editorloadingbox").html("<div style='text-align:left;color:red;font-size:16px;'><b>An error occurred</b><br>The error was reported with the following id: '" + errorId + "'<br><br><span style='color:black;font-weight:bold;font-size:16px'>Please press and hold Ctrl and press F5 to reload this page, if the problem persists please send this error message to your webmaster: </span><div style='color:black;font-size:14px'>'" + "ErrorId: " + errorId + "<br>URL: " + window.location.href + "<br>UserAgent: " + userAgent + "<br>" + msg + " in " + url + " at line " + linenumber + "'</div></div>"); } |