Skip paragraphs with no text when looking for richtext description
This commit is contained in:
parent
88a7ca5625
commit
6be766d015
2 changed files with 23 additions and 8 deletions
|
@ -112,8 +112,9 @@ module RichText
|
|||
end
|
||||
|
||||
def description
|
||||
@paragraph_element = first_paragraph_element(document.root) unless defined? @paragraph_element
|
||||
truncated_text_content(@paragraph_element) if @paragraph_element
|
||||
return @description if defined? @description
|
||||
|
||||
@description = first_truncated_text_content(document.root)
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -131,12 +132,14 @@ module RichText
|
|||
end
|
||||
end
|
||||
|
||||
def first_paragraph_element(element)
|
||||
return element if paragraph?(element)
|
||||
|
||||
element.children.find do |child|
|
||||
nested_paragraph = first_paragraph_element(child)
|
||||
break nested_paragraph if nested_paragraph
|
||||
def first_truncated_text_content(element)
|
||||
if paragraph?(element)
|
||||
truncated_text_content(element)
|
||||
else
|
||||
element.children.find do |child|
|
||||
text = first_truncated_text_content(child)
|
||||
break text unless text.nil?
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -155,6 +158,8 @@ module RichText
|
|||
end
|
||||
append_text.call(element)
|
||||
|
||||
return nil if text.blank?
|
||||
|
||||
text.truncate(MAX_DESCRIPTION_LENGTH)
|
||||
end
|
||||
|
||||
|
|
|
@ -345,6 +345,16 @@ class RichTextTest < ActiveSupport::TestCase
|
|||
assert_equal "Here starts the text.", r.description
|
||||
end
|
||||
|
||||
def test_markdown_description_after_image
|
||||
r = RichText.new("markdown", "\n\nThis is below the image.")
|
||||
assert_equal "This is below the image.", r.description
|
||||
end
|
||||
|
||||
def test_markdown_description_only_first_paragraph
|
||||
r = RichText.new("markdown", "This thing.\n\nMaybe also that thing.")
|
||||
assert_equal "This thing.", r.description
|
||||
end
|
||||
|
||||
def test_markdown_description_elements
|
||||
r = RichText.new("markdown", "*Something* **important** [here](https://example.com/).")
|
||||
assert_equal "Something important here.", r.description
|
||||
|
|
Loading…
Add table
Reference in a new issue