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 2009-12-07 15:31:28 -06:00
parent 36bf257d72 2c5c6dc78a
commit 5090d1f167
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/wiki_controller.rb
View file

@ -358,7 +358,7 @@ class WikiController < ApplicationController
end end
def tex def tex
if @web.markup == :markdownMML or @web.markup == :markdownPNG or @web.markup == :markdown if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
@tex_content = Maruku.new(@page.content).to_latex @tex_content = Maruku.new(@page.content).to_latex
else else
@tex_content = 'TeX export only supported with the Markdown text filters.' @tex_content = 'TeX export only supported with the Markdown text filters.'
@ -366,7 +366,7 @@ class WikiController < ApplicationController
end end
def s5 def s5
if @web.markup == :markdownMML || @web.markup == :markdownPNG || @web.markup == :markdown if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
my_rendered = PageRenderer.new(@page.revisions.last) my_rendered = PageRenderer.new(@page.revisions.last)
@s5_content = my_rendered.display_s5 @s5_content = my_rendered.display_s5
@s5_theme = my_rendered.s5_theme @s5_theme = my_rendered.s5_theme

1
public/s5/ui/core/slides.js
View file

@ -535,7 +535,6 @@ function notOperaFix() {
slides.setAttribute('media','screen'); slides.setAttribute('media','screen');
outline.disabled = true; outline.disabled = true;
if (isGe) { if (isGe) {
slides.setAttribute('href','null'); // Gecko fix
slides.setAttribute('href',slideCSS); // Gecko fix slides.setAttribute('href',slideCSS); // Gecko fix
} }
if (isIE && document.styleSheets && document.styleSheets[0]) { if (isIE && document.styleSheets && document.styleSheets[0]) {