Revert "Use Redcarpet::Render::XHTML instead of our custom renderer"

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 7d8010af1785ea6c9b275baf3fb572f997192ad2..87ea58933579e93c043d1ed28adf5f9ac7a0f094 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -82,13 +82,27 @@ module RichText
   private
 
     def html_parser
   private
 
     def html_parser

-      @@html_renderer ||= Redcarpet::Render::XHTML.new({
-        :filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" }
+      @@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
       })
     end
       })
       @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer, {
         :no_intra_emphasis => true, :autolink => true, :space_after_headers => true
       })
     end

+
+    class Renderer < Redcarpet::Render::XHTML
+      def link(link, title, alt_text)
+        "<a rel=\"nofollow\" href=\"#{link}\">#{alt_text}</a>"
+      end
+
+      def autolink(link, link_type)
+        if link_type == :email
+          "<a rel=\"nofollow\" href=\"mailto:#{link}\">#{link}</a>"
+        else
+          "<a rel=\"nofollow\" href=\"#{link}\">#{link}</a>"
+        end
+      end 
+    end

   end
 
   class Text < Base
   end
 
   class Text < Base