Skip to content

E
edx-platform
Commit e57487db by Adam Palay Committed by Adam Palay
Options

update mathjax to 2.6 (TNL-4104) and (TNL-4094) 

update mathjax class names to support common html, html-css, and svg
parent da0992b4
Showing with 20 additions and 30 deletions
cms/static/cms/js/require-config.js
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
// Since we are serving the gettext catalog as static files, // Since we are serving the gettext catalog as static files,
// the URL for the gettext file will vary depending on which locale // the URL for the gettext file will vary depending on which locale
// needs to be served. To handle this, we load the correct file in the // needs to be served. To handle this, we load the correct file in the
// rendered template and then use this to ensure that RequireJS knows // rendered template and then use this to ensure that RequireJS knows
// how to find it. // how to find it.
define("gettext", function () { return window.gettext; }); define("gettext", function () { return window.gettext; });
} }
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
// end of Annotation tool files // end of Annotation tool files
// externally hosted files // externally hosted files
"mathjax": "//cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&delayStartupUntil=configured", // jshint ignore:line "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured", // jshint ignore:line
"youtube": [ "youtube": [
// youtube URL does not end in ".js". We add "?noext" to the path so // 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, // that require.js adds the ".js" to the query component of the URL,
...@@ -289,16 +289,16 @@ ...@@ -289,16 +289,16 @@
}, },
"ova":{ "ova":{
exports: "ova", exports: "ova",
deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube", deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube",
"rangeslider", "share-annotator", "richText-annotator", "reply-annotator", "rangeslider", "share-annotator", "richText-annotator", "reply-annotator",
"tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator", "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator",
"jquery-Watch", "catch", "handlebars", "URI"] "jquery-Watch", "catch", "handlebars", "URI"]
}, },
"osda":{ "osda":{
exports: "osda", exports: "osda",
deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube", deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube",
"rangeslider", "share-annotator", "richText-annotator", "reply-annotator", "rangeslider", "share-annotator", "richText-annotator", "reply-annotator",
"tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator", "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator",
"openseadragon", "jquery-Watch", "catch", "handlebars", "URI"] "openseadragon", "jquery-Watch", "catch", "handlebars", "URI"]
} }
// end of annotation tool files // end of annotation tool files
......
cms/static/coffee/spec/main.coffee
...@@ -51,7 +51,7 @@ requirejs.config({ ...@@ -51,7 +51,7 @@ requirejs.config({
"URI": "xmodule_js/common_static/js/vendor/URI.min", "URI": "xmodule_js/common_static/js/vendor/URI.min",
"mock-ajax": "xmodule_js/common_static/js/vendor/mock-ajax", "mock-ajax": "xmodule_js/common_static/js/vendor/mock-ajax",
"mathjax": "//cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&delayStartupUntil=configured", "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured",
"youtube": "//www.youtube.com/player_api?noext", "youtube": "//www.youtube.com/player_api?noext",
"coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix", "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({ ...@@ -42,7 +42,7 @@ requirejs.config({
"domReady": "xmodule_js/common_static/js/vendor/domReady", "domReady": "xmodule_js/common_static/js/vendor/domReady",
"URI": "xmodule_js/common_static/js/vendor/URI.min", "URI": "xmodule_js/common_static/js/vendor/URI.min",
"mathjax": "//cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&delayStartupUntil=configured", "mathjax": "//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured",
"youtube": "//www.youtube.com/player_api?noext", "youtube": "//www.youtube.com/player_api?noext",
"coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix" "coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix"
......
common/djangoapps/terrain/ui_helpers.py
...@@ -346,9 +346,9 @@ def css_contains_text(css_selector, partial_text, index=0): ...@@ -346,9 +346,9 @@ def css_contains_text(css_selector, partial_text, index=0):
# If we're expecting a non-empty string, give the page # If we're expecting a non-empty string, give the page
# a chance to fill in text fields. # a chance to fill in text fields.
if partial_text: if partial_text:
wait_for(lambda _: css_text(css_selector, index=index)) wait_for(lambda _: css_html(css_selector, index=index))
actual_text = css_text(css_selector, index=index) actual_text = css_html(css_selector, index=index)
return partial_text in actual_text return partial_text in actual_text
......
common/lib/xmodule/xmodule/css/capa/display.scss
...@@ -462,28 +462,18 @@ div.problem { ...@@ -462,28 +462,18 @@ div.problem {
span { span {
margin-bottom: 0; margin-bottom: 0;
display: inline-block;
&.math { &.MathJax_CHTML, &.MathJax, &.MathJax_SVG {
display: inline-block;
padding: 6px; padding: 6px;
min-width: 30px; min-width: 30px;
border: 1px solid #e3e3e3; border: 1px solid #e3e3e3;
border-radius: 4px; border-radius: 4px;
background: #f1f1f1; background: #f1f1f1;
& span {
// Needed to fix mathjax rendering bug in chrome (TNL-4080)
border-left-style: none !important;
}
} }
} }
} }
// Fix for formulaequationinput, overriding MathJax_Display default style to allow "loading" image to sit next to it
section.formulaequationinput div.equation .MathJax_Display {
display: inline-block !important;
}
// Hides equation previews in symbolic response problems when printing // Hides equation previews in symbolic response problems when printing
[id^='display'].equation { [id^='display'].equation {
@media print { @media print {
......
common/templates/mathjax_include.html
...@@ -76,4 +76,4 @@ ...@@ -76,4 +76,4 @@
<!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates. <!-- 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 It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
MathJax extension libraries --> MathJax extension libraries -->
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script> <script type="text/javascript" src="https://cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
common/test/acceptance/pages/lms/discussion.py
...@@ -126,7 +126,7 @@ class DiscussionThreadPage(PageObject, DiscussionPageMixin): ...@@ -126,7 +126,7 @@ class DiscussionThreadPage(PageObject, DiscussionPageMixin):
def verify_mathjax_rendered(self): def verify_mathjax_rendered(self):
""" Checks that MathJax css class is present """ """ Checks that MathJax css class is present """
self.wait_for( self.wait_for(
lambda: self._is_element_visible(".MathJax"), lambda: self._is_element_visible(".MathJax_CHTML"),
description="MathJax Preview is rendered" description="MathJax Preview is rendered"
) )
......
common/test/acceptance/pages/lms/problem.py
...@@ -49,7 +49,7 @@ class ProblemPage(PageObject): ...@@ -49,7 +49,7 @@ class ProblemPage(PageObject):
""" """
def mathjax_present(): def mathjax_present():
""" Returns True if MathJax css is present in the problem body """ """ Returns True if MathJax css is present in the problem body """
mathjax_container = self.q(css="div.problem p .MathJax .math") mathjax_container = self.q(css="div.problem p .MathJax_CHTML")
return mathjax_container.visible and mathjax_container.present return mathjax_container.visible and mathjax_container.present
self.wait_for( self.wait_for(
...@@ -63,7 +63,7 @@ class ProblemPage(PageObject): ...@@ -63,7 +63,7 @@ class ProblemPage(PageObject):
""" """
def mathjax_present(): def mathjax_present():
""" Returns True if MathJax css is present in the problem body """ """ Returns True if MathJax css is present in the problem body """
mathjax_container = self.q(css="div.problem div.problem-hint .MathJax .math") mathjax_container = self.q(css="div.problem div.problem-hint .MathJax_CHTML")
return mathjax_container.visible and mathjax_container.present return mathjax_container.visible and mathjax_container.present
self.wait_for( self.wait_for(
......
common/test/acceptance/pages/lms/tab_nav.py
...@@ -40,7 +40,7 @@ class TabNavPage(PageObject): ...@@ -40,7 +40,7 @@ class TabNavPage(PageObject):
""" """
Check that MathJax has rendered in tab content Check that MathJax has rendered in tab content
""" """
mathjax_container = self.q(css=".static_tab_wrapper .MathJax .math") mathjax_container = self.q(css=".static_tab_wrapper .MathJax_CHTML")
EmptyPromise( EmptyPromise(
lambda: mathjax_container.present and mathjax_container.visible, lambda: mathjax_container.present and mathjax_container.visible,
"MathJax is not visible" "MathJax is not visible"
......
lms/static/js/spec/main.js
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
'jasmine.async': 'xmodule_js/common_static/js/vendor/jasmine.async', 'jasmine.async': 'xmodule_js/common_static/js/vendor/jasmine.async',
'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly.pkgd', 'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly.pkgd',
'domReady': 'xmodule_js/common_static/js/vendor/domReady', 'domReady': 'xmodule_js/common_static/js/vendor/domReady',
'mathjax': '//cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&delayStartupUntil=configured', // jshint ignore:line 'mathjax': '//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_CHTML&delayStartupUntil=configured', // jshint ignore:line
'youtube': '//www.youtube.com/player_api?noext', 'youtube': '//www.youtube.com/player_api?noext',
'coffee/src/ajax_prefix': 'xmodule_js/common_static/coffee/src/ajax_prefix', 'coffee/src/ajax_prefix': 'xmodule_js/common_static/coffee/src/ajax_prefix',
'coffee/src/instructor_dashboard/student_admin': 'coffee/src/instructor_dashboard/student_admin', 'coffee/src/instructor_dashboard/student_admin': 'coffee/src/instructor_dashboard/student_admin',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment