Merge pull request #2792 from takluyver/mathjax-callback-err

Attempt to fix mysterious mathjax callback error

Author: minrk

notebook/static/base/js/utils.js

@@ -940,12 +940,17 @@ define([
         if(!window.MathJax){
             return;
         }
-        return $el.map(function(){
+        $el.map(function(){
             // MathJax takes a DOM node: $.map makes `this` the context
-            return MathJax.Hub.Queue(
-                ["Typeset", MathJax.Hub, this],
-                ["resetEquationNumbers",MathJax.InputJax.TeX]
-            );
+            MathJax.Hub.Queue(["Typeset", MathJax.Hub, this]);
+            try {
+                MathJax.Hub.Queue(
+                    ["Require", MathJax.Ajax, "[MathJax]/extensions/TeX/AMSmath.js"],
+                    function() { MathJax.InputJax.TeX.resetEquationNumbers(); }
+                );
+            } catch (e) {
+                console.error("Error queueing resetEquationNumbers:", e);
+            }
         });
     };
 

notebook/static/notebook/js/notebook.js

@@ -3001,7 +3001,7 @@ define([
             this.fromJSON(data);
         } catch (e) {
             failed = e;
-            console.log("Notebook failed to load from JSON:", e);
+            console.error("Notebook failed to load from JSON:", e);
         }
         if (failed || data.message) {
             // *either* fromJSON failed or validation failed