Revert "Lms should be independent of mathjax"

This reverts commit 4a086f54d5.
This commit is contained in:
Adam Palay
2015-03-17 10:44:48 -04:00
parent b50e004b2d
commit 71ab971c72
2 changed files with 26 additions and 32 deletions

View File

@@ -6,38 +6,33 @@
## This enables ASCIIMathJAX, and is used by js_textbox
<%def name="mathjaxConfig()">
%if mathjax_mode is not Undefined and mathjax_mode == 'wiki':
MathJax.Hub.Config({
tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
});
%else:
MathJax.Hub.Config({
tex2jax: {
inlineMath: [
["\\(","\\)"],
['[mathjaxinline]','[/mathjaxinline]']
],
displayMath: [
["\\[","\\]"],
['[mathjax]','[/mathjax]']
]
}
});
%endif
MathJax.Hub.Configured();
window.HUB = MathJax.Hub;
</%def>
%if mathjax_mode is not Undefined and mathjax_mode == 'wiki':
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
});
HUB = MathJax.Hub
</script>
%else:
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {
inlineMath: [
["\\(","\\)"],
['[mathjaxinline]','[/mathjaxinline]']
],
displayMath: [
["\\[","\\]"],
['[mathjax]','[/mathjax]']
]
}
});
HUB = MathJax.Hub
</script>
%endif
<!-- 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">
;(function (require) {
'use strict';
require(['mathjax'], function() {
${mathjaxConfig()}
});
}).call(this, require || RequireJS.require);
</script>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/2.4-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>

View File

@@ -67,7 +67,6 @@
"ova": 'js/vendor/ova/ova',
"catch": 'js/vendor/ova/catch/js/catch',
"handlebars": 'js/vendor/ova/catch/js/handlebars-1.1.2',
"mathjax": 'https://cdn.mathjax.org/mathjax/2.4-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full'
// end of files needed by OVA
},
shim: {