Merge pull request #5019 from tomhughes/oauth2-cleanup

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index f19d3d3a952ddd2c8240e2ea8da228c434523ffc..a439342f7743f9b1fb8682147f6562a9ff0750ab 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -53,6 +53,10 @@ module RichText
       nil
     end
 
       nil
     end
 

+    def image_alt
+      nil
+    end
+

     protected
 
     def simple_format(text)
     protected
 
     def simple_format(text)


@@ -92,9 +96,13 @@ module RichText
     end
 
     def image
     end
 
     def image

-      return @image if defined? @image
+      @image_element = first_image_element(document.root) unless defined? @image_element
+      @image_element.attr["src"] if @image_element
+    end

 
 

-      @image = first_image_element(document.root)&.attr&.[]("src")
+    def image_alt
+      @image_element = first_image_element(document.root) unless defined? @image_element
+      @image_element.attr["alt"] if @image_element

     end
 
     private
     end
 
     private


@@ -104,13 +112,17 @@ module RichText
     end
 
     def first_image_element(element)
     end
 
     def first_image_element(element)

-      return element if element.type == :img
+      return element if image?(element) && element.attr["src"].present?

 
       element.children.find do |child|
         nested_image = first_image_element(child)
         break nested_image if nested_image
       end
     end
 
       element.children.find do |child|
         nested_image = first_image_element(child)
         break nested_image if nested_image
       end
     end

+
+    def image?(element)
+      element.type == :img || (element.type == :html_element && element.value == "img")
+    end

   end
 
   class Text < Base
   end
 
   class Text < Base