Remove the contains_mathjax javascript function; instead, always call…

… MathJax to typeset what it can. If this ends up typesetting too much, we should probably use the MathJax tools for ignoring certain divs.
jasongrout · Jan 14, 2012 · 8d6b0a0 · 8d6b0a0
1 parent 6a4eed4
commit 8d6b0a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 37 deletions.
diff --git a/sagenb/data/sage/js/debug.js b/sagenb/data/sage/js/debug.js
@@ -177,7 +177,6 @@ var sagenb_debug = (function debugging(options) {
         // 'continue_update_check',
         // 'start_update_check',
         // 'cancel_update_check',
-        // 'contains_mathjax',
         // 'set_output_text',
         // 'set_input_text',
         // 'CellWriter',

diff --git a/sagenb/data/sage/js/notebook_lib.js b/sagenb/data/sage/js/notebook_lib.js
@@ -1234,12 +1234,10 @@ function update_introspection_text(id, text) {
 
     if (intr.loaded) {
         introspect_div.html(text);
-        if (contains_mathjax(text)) {
-            try {
-                MathJax.Hub.Queue(["Typeset",MathJax.Hub,introspect_div.get(0)]);
-            } catch (e) {
-                introspect_div.html('Error typesetting mathematics' + introspect_div.html());
-            }
+        try {
+            MathJax.Hub.Queue(["Typeset",MathJax.Hub,introspect_div.get(0)]);
+        } catch (e) {
+            introspect_div.html('Error typesetting mathematics' + introspect_div.html());
         }
 
         introspect_div.find('.docstring').prepend('<div class="click-message" style="cursor: pointer">' + translations["Click here to pop out"] + '</div><div class="unprinted-note">' + translations["unprinted"] + '</div>');
@@ -3535,25 +3533,6 @@ function cancel_update_check() {
 }
 
 
-function contains_mathjax(text) {
-    /*
-    Returns true if text contains some mathjax text.  This function
-    sucks, since it really just looks for class="math" or type="math/tex" and is easy to
-    throw off.  Fix this!
-
-    INPUT:
-        text -- a string
-    */
-    // TODO: Use a RegExp.
-    text = text.toLowerCase();
-    // Mathjax - match math/tex and math/tex; mode=display
-    return (text.indexOf('class="math"') !== -1 ||
-            text.indexOf("class='math'") !== -1 ||
-            text.indexOf('type="math/tex') !== -1 ||
-            text.indexOf("type='math/tex") !== -1);
-}
-
-
 function set_output_text(id, status, output_text, output_text_wrapped,
                          output_html, introspect_html, no_interact) {
     /*
@@ -3612,9 +3591,7 @@ function set_output_text(id, status, output_text, output_text_wrapped,
 
         cell_interact = get_element('cell-interact-' + id);
         cell_interact.innerHTML = new_interact_output;
-        if (contains_mathjax(new_interact_output)) {
-            MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_interact]);
-        }
+        MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_interact]);
 
         return false;
     }
@@ -3636,7 +3613,7 @@ function set_output_text(id, status, output_text, output_text_wrapped,
     cell_output_html.innerHTML = output_html;
 
     // Call MathJax on the final output.
-    if (status === 'd' && (contains_mathjax(output_text)||contains_mathjax(output_text_wrapped))) {
+    if (status === 'd' ) {
         try {
             MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_output]);
         } catch (e) {
@@ -3660,13 +3637,7 @@ function set_output_text(id, status, output_text, output_text_wrapped,
     if (status === 'd' && introspect_html === '' && is_interacting_cell(id)) {
         // This is the first time that the underlying Python interact
         // function (i.e., interact.recompute) is actually called!
-        if (contains_mathjax(output_text_wrapped)) {
-            try {
-                MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_output]);
-            } catch (e2) {
-                // Do nothing.
-            }
-        }
+        MathJax.Hub.Queue(["Typeset",MathJax.Hub,cell_output]);
         return 'trigger_interact';
     }