merge master

Author: bnmnetp

runestone/common/js/runestonebase.js

@@ -364,6 +364,14 @@ export default class RunestoneBase {
         return `${this.constructor.name}: ${this.divid}`
     }
 
+    queueMathJax(component) {
+        if (MathJax.version.substring(0, 1) === "2") {
+            MathJax.Hub.Queue(["Typeset", MathJax.Hub, component]);
+        } else {
+            MathJax.typesetPromise([component])
+        }
+    }
+
 }
 
 window.RunestoneBase = RunestoneBase;

runestone/fitb/js/fitb.js

@@ -339,7 +339,7 @@ export default class FITB extends RunestoneBase {
         }
         this.feedBackDiv.innerHTML = feedback_html;
         if (typeof MathJax !== "undefined") {
-            MathJax.Hub.Queue(["Typeset", MathJax.Hub]);
+            this.queueMathJax(document.body)
         }
     }
 

runestone/parsons/js/parsons.js

@@ -591,7 +591,7 @@ export default class Parsons extends RunestoneBase {
         this.initializeTabIndex();
         if (this.options.language == "natural" || this.options.language == "math") {
             if (typeof MathJax !== "undefined") {
-                MathJax.Hub.Queue(["Typeset", MathJax.Hub, this.outerDiv]);
+                this.queueMathJax(this.outerDiv)
             }
         }
     }

runestone/shortanswer/js/shortanswer.js

@@ -127,7 +127,7 @@ export default class ShortAnswer extends RunestoneBase {
         // before MathJax is loaded.  In that case we will need to implement something
         // like `the solution described here <https://stackoverflow.com/questions/3014018/how-to-detect-when-mathjax-is-fully-loaded>`_
         if (typeof MathJax !== "undefined") {
-            MathJax.Hub.Queue(["Typeset", MathJax.Hub, this.containerDiv]);
+            this.queueMathJax(this.containerDiv)
         }
     }
 
@@ -136,7 +136,7 @@ export default class ShortAnswer extends RunestoneBase {
             value = value.replace(/\$\$(.*?)\$\$/g, "\\[ $1 \\]");
             value = value.replace(/\$(.*?)\$/g, "\\( $1 \\)");
             $(this.renderedAnswer).text(value);
-            MathJax.Hub.Queue(["Typeset", MathJax.Hub, this.renderedAnswer]);
+            this.queueMathJax(this.renderedAnswer)
         }
     }
 
@@ -287,7 +287,7 @@ $(document).bind("runestone:login-complete", function () {
                     useRunestoneServices: eBookConfig.useRunestoneServices,
                 });
             } catch (err) {
-                console.log(`Error rendering ClickableArea Problem ${this.id}
+                console.log(`Error rendering ShortAnswer Problem ${this.id}
                 Details: ${err}`);
             }
         }

setup.py

@@ -10,8 +10,12 @@
 with open("requirements.txt", "r", encoding="utf-8") as fh:
     dependencies = [l.strip() for l in fh]
 
+<<<<<<< HEAD
 
 VERSION = "6.0.0dev"
+=======
+VERSION = "5.10.0"
+>>>>>>> master
 
 # These pre-install hooks are useful to make sure any pre-requisite
 # programs that are not pip installable are in place.