Merge branch 'mathjax-hotfix'

68c47236 · Bridger Maxwell · 949745da · 14cd055e · 68c47236 · 68c47236
Commit 68c47236 authored Apr 06, 2012 by Bridger Maxwell
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

templates/main.html
+3 -3

templates/simplewiki_base.html
+1 -1

No files found.
--- a/templates/main.html
+++ b/templates/main.html
@@ -20,10 +20,10 @@
      displayMath: [["\\[","\\]"]]}
    });
  </script>
-  <script type="text/javascript" src="${ settings.LIB_URL }mathjax-MathJax-c9db6ac/MathJax.js?config=TeX-AMS_HTML-full"></script>
-
-<%block name="headextra"/>
+  <%block name="headextra"/>

+  <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates -->
+  <script type="text/javascript" src="${ settings.LIB_URL }mathjax-MathJax-c9db6ac/MathJax.js?config=TeX-AMS_HTML-full"></script>
 </head>

 <body class="<%block name="bodyclass"/>">

--- a/templates/simplewiki_base.html
+++ b/templates/simplewiki_base.html
@@ -40,7 +40,7 @@
      tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
                displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
    });
-  </script> <script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> 
+  </script> 
  <script>
  $(function(){
  $.ajaxSetup ({