deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Jacques Distler 2011-06-11 23:42:34 -05:00
parent ec31e46e92 cbf13ad57a
commit 97148dc205
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -279,7 +279,7 @@ module Instiki
MINOR = 19 MINOR = 19
TINY = 2 TINY = 2
SUFFIX = '(MML+)' SUFFIX = '(MML+)'
PRERELEASE = 'pre' PRERELEASE = false
if PRERELEASE if PRERELEASE
STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX
else else

12
app/views/layouts/default.rhtml
View file

@ -36,11 +36,19 @@
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%- if @web -%> <%- if @web -%>
<%- if @web.markup == :markdownMML -%> <%- 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"> <script type="text/javascript">
if (!(Prototype.Browser.Gecko || navigator.userAgent.match(/MathPlayer/))) { if (!(Prototype.Browser.Gecko || navigator.userAgent.match(/MathPlayer/))) {
var s = document.createElement('script'); 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); document.querySelector('head').appendChild(s);
window.addEventListener("load", function(){window._onload_fired_ = true} , false);
}; };
</script> </script>
<%- end -%> <%- end -%>

10
app/views/wiki/s5.rhtml
View file

@ -22,11 +22,19 @@
<!-- S5 JS --> <!-- S5 JS -->
<%= javascript_include_tag 'prototype' %> <%= javascript_include_tag 'prototype' %>
<%- if @web.markup == :markdownMML -%> <%- 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"> <script type="text/javascript">
if (!(Prototype.Browser.Gecko || navigator.userAgent.match(/MathPlayer/))) { if (!(Prototype.Browser.Gecko || navigator.userAgent.match(/MathPlayer/))) {
var s = document.createElement('script'); 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); document.querySelector('head').appendChild(s);
window.addEventListener("load", function(){window._onload_fired_ = true} , false);
}; };
</script> </script>
<%- end -%> <%- end -%>