Merge pull request #1378 from parleur/nice_customjs

Protection againt bad custom.js

notebook/static/edit/js/main.js

@@ -25,7 +25,13 @@ require([
     notificationarea
     ){
     "use strict";
-    requirejs(['custom/custom'], function() {});
+
+    try {
+        requirejs(['custom/custom'], function() {});
+    } catch(err) {
+        console.log("Error loading custom.js from edition service. Continuing and logging");
+        console.warn(err);
+    }
     
     page = new page.Page();
 

notebook/static/notebook/js/main.js

@@ -52,8 +52,13 @@ require([
 
     // Pull typeahead from the global jquery object
     var typeahead = $.typeahead;
-
-    requirejs(['custom/custom'], function() {});
+    
+    try{
+        requirejs(['custom/custom'], function() {});
+    } catch(err) {
+        console.log("Error processing custom.js. Logging and continuing")
+        console.warn(err);
+    }
 
     // compat with old IPython, remove for IPython > 3.0
     window.CodeMirror = CodeMirror;

notebook/static/tree/js/main.js

@@ -30,7 +30,12 @@ require([
     newnotebook,
     loginwidget){
     "use strict";
-    requirejs(['custom/custom'], function() {});
+    try{
+        requirejs(['custom/custom'], function() {});
+    } catch(err) {
+        console.log("Error loading custom.js from tree service. Continuing and logging");
+        console.warn(err);
+    }
 
     // Setup all of the config related things