diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index 19674e4f..31f377ea 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -358,7 +358,7 @@ class WikiController < ApplicationController end 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 else @tex_content = 'TeX export only supported with the Markdown text filters.' @@ -366,7 +366,7 @@ class WikiController < ApplicationController end 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) @s5_content = my_rendered.display_s5 @s5_theme = my_rendered.s5_theme diff --git a/public/s5/ui/core/slides.js b/public/s5/ui/core/slides.js index 2c703ff8..c5ff3a29 100644 --- a/public/s5/ui/core/slides.js +++ b/public/s5/ui/core/slides.js @@ -535,7 +535,6 @@ function notOperaFix() { slides.setAttribute('media','screen'); outline.disabled = true; if (isGe) { - slides.setAttribute('href','null'); // Gecko fix slides.setAttribute('href',slideCSS); // Gecko fix } if (isIE && document.styleSheets && document.styleSheets[0]) {