From fa3020dffdab4a69bba045965ca038ca3d21575a Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Mon, 23 Jul 2012 14:12:36 +0200
Subject: [PATCH 1/3] Display errors occuring on page load to the user.

---
 src/templates/pad.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 36d6334c2..6821b5e6c 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -316,6 +316,19 @@
         <% e.end_block(); %>
 
         <% e.begin_block("scripts"); %>
+        <script type="text/javascript">
+            /* Display errors on page load to the user 
+               (Gets overridden by padutils.setupGlobalExceptionHandler)
+            */
+            window.onerror = function(msg, url, line) {
+              console.log('error', arguments);
+              var box   = document.getElementById('editorloadingbox');
+              box.innerHTML = '<p><b>An error occured while loading the pad</b></p>'
+                            + '<p><b>'+msg+'</b> '
+                            + '<small>in '+ url +' (line '+ line +')</small></p>'
+            };
+        </script>
+
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
 

From c3dcb08a2cbccb4021baf5667e5fcedca98af10b Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Mon, 23 Jul 2012 14:33:30 +0200
Subject: [PATCH 2/3] Remove console.log

---
 src/templates/pad.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 6821b5e6c..2d4ceca0b 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -321,7 +321,6 @@
                (Gets overridden by padutils.setupGlobalExceptionHandler)
             */
             window.onerror = function(msg, url, line) {
-              console.log('error', arguments);
               var box   = document.getElementById('editorloadingbox');
               box.innerHTML = '<p><b>An error occured while loading the pad</b></p>'
                             + '<p><b>'+msg+'</b> '

From 6f91facf4938ffc2df2ac380d9735149a4bc37a9 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Mon, 23 Jul 2012 15:03:20 +0200
Subject: [PATCH 3/3] Retain original onerror handler.

---
 src/templates/pad.html | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 2d4ceca0b..3597ff7b3 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -320,12 +320,17 @@
             /* Display errors on page load to the user 
                (Gets overridden by padutils.setupGlobalExceptionHandler)
             */
-            window.onerror = function(msg, url, line) {
-              var box   = document.getElementById('editorloadingbox');
-              box.innerHTML = '<p><b>An error occured while loading the pad</b></p>'
-                            + '<p><b>'+msg+'</b> '
-                            + '<small>in '+ url +' (line '+ line +')</small></p>'
-            };
+            (function() {
+              var originalHandler = window.onerror;
+              window.onerror = function(msg, url, line) {
+                var box   = document.getElementById('editorloadingbox');
+                box.innerHTML = '<p><b>An error occured while loading the pad</b></p>'
+                              + '<p><b>'+msg+'</b> '
+                              + '<small>in '+ url +' (line '+ line +')</small></p>';
+                // call original error handler
+                if(typeof(originalHandler) == 'function') originalHandler.call(null, arguments);
+              };
+            })();
         </script>
 
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>