Merge pull request #11651 from edx/release

Release

cms/static/cms/js/require-config.js

@@ -91,7 +91,7 @@
             // end of Annotation tool files
 
             // externally hosted files
-            "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured", // jshint ignore:line
+            "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG&delayStartupUntil=configured", // jshint ignore:line
             "youtube": [
                 // youtube URL does not end in ".js". We add "?noext" to the path so
                 // that require.js adds the ".js" to the query component of the URL,

cms/static/coffee/spec/main.coffee

@@ -51,7 +51,7 @@ requirejs.config({
         "URI": "xmodule_js/common_static/js/vendor/URI.min",
         "mock-ajax": "xmodule_js/common_static/js/vendor/mock-ajax",
 
-        "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured",
+        "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG&delayStartupUntil=configured",
         "youtube": "//www.youtube.com/player_api?noext",
 
         "coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix",

cms/static/coffee/spec/main_squire.coffee

@@ -42,7 +42,7 @@ requirejs.config({
         "domReady": "xmodule_js/common_static/js/vendor/domReady",
         "URI": "xmodule_js/common_static/js/vendor/URI.min",
 
-        "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured",
+        "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG&delayStartupUntil=configured",
         "youtube": "//www.youtube.com/player_api?noext",
 
         "coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix"

common/lib/capa/capa/templates/formulaequationinput.html

@@ -20,7 +20,7 @@
       <p id="answer_${id}" class="answer"></p>
 
       <div id="input_${id}_preview" class="equation">
-        \[\]
+        \(\)
         <img src="${STATIC_URL}images/spinner.gif" class="loading" alt="Loading"/>
       </div>
   </div>

common/static/js/capa/spec/formula_equation_preview_spec.js

@@ -139,7 +139,7 @@ describe("Formula Equation Preview", function () {
             // Either it makes a request or jumps straight into displaying ''.
             waitsFor(function () {
                 // (Short circuit if `inputAjax` is indeed called)
-                return Problem.inputAjax.wasCalled || 
+                return Problem.inputAjax.wasCalled ||  // jshint ignore:line
                     MathJax.Hub.Queue.wasCalled;
             }, "AJAX never called on user input", 1000);
 
@@ -266,7 +266,7 @@ describe("Formula Equation Preview", function () {
 
                 // We should look in the preview div for the MathJax.
                 var previewElement = $("#input_THE_ID_preview")[0];
-                expect(previewElement.firstChild.data).toEqual("\\[THE_FORMULA\\]");
+                expect(previewElement.firstChild.data).toEqual("\\(THE_FORMULA\\)");
 
                 // Refresh the MathJax.
                 expect(MathJax.Hub.Queue).toHaveBeenCalledWith(

common/static/js/capa/src/formula_equation_preview.js

@@ -145,7 +145,7 @@ formulaEquationPreview.enable = function () {
                             console.log("[FormulaEquationInput] Oops no mathjax for ", latex);
                             // Fall back to modifying the actual element.
                             var textNode = previewElement.childNodes[0];
-                            textNode.data = "\\[" + latex + "\\]";
+                            textNode.data = "\\(" + latex + "\\)";
                             MathJax.Hub.Queue(["Typeset", MathJax.Hub, previewElement]);
                         }
                     });

common/templates/mathjax_include.html

@@ -76,4 +76,4 @@
 <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
      It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
      MathJax extension libraries -->
-<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
+<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG"></script>

common/test/acceptance/pages/lms/discussion.py

@@ -126,7 +126,7 @@ class DiscussionThreadPage(PageObject, DiscussionPageMixin):
     def verify_mathjax_rendered(self):
         """ Checks that MathJax css class is present """
         self.wait_for(
-            lambda: self._is_element_visible(".MathJax_CHTML"),
+            lambda: self._is_element_visible(".MathJax_SVG"),
             description="MathJax Preview is rendered"
         )
 

common/test/acceptance/pages/lms/problem.py

@@ -49,7 +49,7 @@ class ProblemPage(PageObject):
         """
         def mathjax_present():
             """ Returns True if MathJax css is present in the problem body """
-            mathjax_container = self.q(css="div.problem p .MathJax_CHTML")
+            mathjax_container = self.q(css="div.problem p .MathJax_SVG")
             return mathjax_container.visible and mathjax_container.present
 
         self.wait_for(
@@ -63,7 +63,7 @@ class ProblemPage(PageObject):
         """
         def mathjax_present():
             """ Returns True if MathJax css is present in the problem body """
-            mathjax_container = self.q(css="div.problem div.problem-hint .MathJax_CHTML")
+            mathjax_container = self.q(css="div.problem div.problem-hint .MathJax_SVG")
             return mathjax_container.visible and mathjax_container.present
 
         self.wait_for(

common/test/acceptance/pages/lms/tab_nav.py

@@ -40,7 +40,7 @@ class TabNavPage(PageObject):
         """
         Check that MathJax has rendered in tab content
         """
-        mathjax_container = self.q(css=".static_tab_wrapper .MathJax_CHTML")
+        mathjax_container = self.q(css=".static_tab_wrapper .MathJax_SVG")
         EmptyPromise(
             lambda: mathjax_container.present and mathjax_container.visible,
             "MathJax is not visible"

lms/static/js/spec/main.js

@@ -49,7 +49,7 @@
             'jasmine.async': 'xmodule_js/common_static/js/vendor/jasmine.async',
             'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly.pkgd',
             'domReady': 'xmodule_js/common_static/js/vendor/domReady',
-            'mathjax': '//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured', // jshint ignore:line
+            'mathjax': '//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_SVG&delayStartupUntil=configured', // jshint ignore:line
             'youtube': '//www.youtube.com/player_api?noext',
             'coffee/src/ajax_prefix': 'xmodule_js/common_static/coffee/src/ajax_prefix',
             'coffee/src/instructor_dashboard/student_admin': 'coffee/src/instructor_dashboard/student_admin',