Merge pull request #557 from afshin/typeset

Simplify typeset function.

Author: jasongrout

jupyter-js-widgets/src/utils.js

@@ -143,42 +143,22 @@ function reject(message, log) {
 }
 
 /**
- * Apply MathJax rendering to an element, and optionally set its text
+ * Apply MathJax rendering to an element, and optionally set its text.
  *
  * If MathJax is not available, make no changes.
  *
- * Returns the output any number of typeset elements as an array or undefined if
- * MathJax was not available.
- *
  * Parameters
  * ----------
- * element: Node, NodeList, or jQuery selection
- * text: option string
+ * element: Node
+ * text: optional string
  */
 function typeset(element, text) {
-    if (arguments.length > 1) {
-        if (element.length) {
-            for (var i = 0; i < element.length; ++i) {
-                var el = element[i];
-                el.textContent = text;
-            }
-        } else {
-            element.textContent = text;
-        }
+    if (text !== void 0) {
+        element.textContent = text;
     }
-    if (!window.MathJax) {
-      return;
-    }
-    var output = [];
-    if (element.length) {
-        for (var i = 0; i < element.length; ++i) {
-            var el = element[i];
-            output.push(MathJax.Hub.Queue(['Typeset', MathJax.Hub, el]));
-        }
-    } else {
-        output.push(MathJax.Hub.Queue(['Typeset', MathJax.Hub, element]));
+    if (window.MathJax) {
+      MathJax.Hub.Queue(['Typeset', MathJax.Hub, element]);
     }
-    return output;
 }
 
 /**

jupyter-js-widgets/src/widget.js

@@ -759,7 +759,7 @@ var DOMWidgetViewMixin = {
     },
 
     typeset: function(element, text){
-        utils.typeset.apply(null, arguments);
+        utils.typeset(element, text);
     }
 };