Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

parasew · Jun 12, 2011 · 97148dc · 97148dc
2 parents ec31e46 + cbf13ad
commit 97148dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -279,7 +279,7 @@ module VERSION #:nodoc:
     MINOR = 19
     TINY  = 2 
     SUFFIX = '(MML+)'
-    PRERELEASE =  'pre'
+    PRERELEASE = false
     if PRERELEASE
        STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX
     else

diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
@@ -36,11 +36,19 @@
   <%= csrf_meta_tag %>
   <%- if @web -%>
    <%- if @web.markup == :markdownMML -%>
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+      MathML: { useMathMLspacing: true },
+      "HTML-CSS": { scale: 90 }
+    });
+    if (window._onload_fired_) MathJax.Hub.Startup.onload();
+  </script>
   <script type="text/javascript">
     if (!(Prototype.Browser.Gecko || navigator.userAgent.match(/MathPlayer/))) {
       var s = document.createElement('script');
-      s.src = "<%= compute_public_path('MathJax.js', 'MathJax').split('?')[0] %>?config=instiki";
-      document.querySelector('head').appendChild(s);        
+      s.src = "<%= compute_public_path('MathJax.js', 'MathJax').split('?')[0] %>?config=MML_HTMLorMML";
+      document.querySelector('head').appendChild(s);
+      window.addEventListener("load", function(){window._onload_fired_ = true} , false);        
     };
   </script>
    <%- end -%>

diff --git a/app/views/wiki/s5.rhtml b/app/views/wiki/s5.rhtml
@@ -22,11 +22,19 @@
 <!-- S5 JS -->
 <%= javascript_include_tag 'prototype' %>
 <%- if @web.markup == :markdownMML -%>
+<script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    MathML: { useMathMLspacing: true },
+    "HTML-CSS": { scale: 90 }
+  });
+  if (window._onload_fired_) MathJax.Hub.Startup.onload();
+</script>
 <script type="text/javascript">
   if (!(Prototype.Browser.Gecko || navigator.userAgent.match(/MathPlayer/))) {
     var s = document.createElement('script');
-    s.src = "<%= compute_public_path('MathJax.js', 'MathJax').split('?')[0] %>?config=instiki";
+    s.src = "<%= compute_public_path('MathJax.js', 'MathJax').split('?')[0] %>?config=MML_HTMLorMML";
     document.querySelector('head').appendChild(s);        
+    window.addEventListener("load", function(){window._onload_fired_ = true} , false);        
   };
 </script>
 <%- end -%>