fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Global exception handler is not registered until the page's controller adds it. 

It is bad form to register this handler on definition. This would cause problems if, for instance, this module was required by our Node code.
This commit is contained in:
Chad Weider 2012-01-28 18:12:01 -08:00
parent c12e1aff07
commit 6a4c025e08
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/pad.js
View File

@ -401,6 +401,8 @@ var pad = {
init: function() init: function()
{ {
padutils.setupGlobalExceptionHandler();
$(document).ready(function() $(document).ready(function()
{ {
//start the costum js //start the costum js

16
static/js/pad_utils.js
View File

@ -459,9 +459,12 @@ var padutils = {
} }
}; };
//send javascript errors to the server var globalExceptionHandler = undefined;
window.onerror = function test (msg, url, linenumber) 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 errObj = {errorInfo: JSON.stringify({msg: msg, url: url, linenumber: linenumber, userAgent: navigator.userAgent})};
var loc = document.location; var loc = document.location;
var url = loc.protocol + "//" + loc.hostname + ":" + loc.port + "/" + loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "jserror"; var url = loc.protocol + "//" + loc.hostname + ":" + loc.port + "/" + loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "jserror";
@ -469,7 +472,12 @@ window.onerror = function test (msg, url, linenumber)
$.post(url, errObj); $.post(url, errObj);
return false; return false;
}; };
window.onerror = globalExceptionHandler;
}
}
padutils.setupGlobalExceptionHandler = setupGlobalExceptionHandler;
padutils.binarySearch = require('/ace2_common').binarySearch; padutils.binarySearch = require('/ace2_common').binarySearch;