X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..4607ac2d30806fbfb00969df92823154df4a9a2f:/lib/rich_text.rb?ds=sidebyside diff --git a/lib/rich_text.rb b/lib/rich_text.rb index 503ecedbd..7325a2a28 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -4,7 +4,6 @@ module RichText when "html" then HTML.new(text || "") when "markdown" then Markdown.new(text || "") when "text" then Text.new(text || "") - else; nil end end @@ -73,18 +72,19 @@ module RichText class Markdown < Base def to_html - html_parser.render(self).html_safe + Markdown.html_parser.render(self).html_safe end def to_text to_s end - private + def self.html_renderer + @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true) + end - def html_parser - @@html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true) - @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true) + def self.html_parser + @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true) end class Renderer < Redcarpet::Render::XHTML