REVERT: FIX: handle clicks counters in quotes
Not quite a full revert of 7696b92c8c
that isn't
actually required.
This commit is contained in:
parent
fcb7422213
commit
9756e35956
|
@ -97,12 +97,7 @@ class CookedPostProcessor
|
||||||
|
|
||||||
return if previous.blank?
|
return if previous.blank?
|
||||||
|
|
||||||
# remove click counters
|
previous_text = Nokogiri::HTML::fragment(previous).text.strip
|
||||||
previous_doc = Nokogiri::HTML::fragment(previous)
|
|
||||||
previous_doc.css("span.clicks").remove
|
|
||||||
|
|
||||||
previous_text = previous_doc.text.strip
|
|
||||||
|
|
||||||
quoted_text = @doc.css("aside.quote:first-child blockquote").first&.text&.strip || ""
|
quoted_text = @doc.css("aside.quote:first-child blockquote").first&.text&.strip || ""
|
||||||
|
|
||||||
return if previous_text.gsub(/(\s){2,}/, '\1') != quoted_text.gsub(/(\s){2,}/, '\1')
|
return if previous_text.gsub(/(\s){2,}/, '\1') != quoted_text.gsub(/(\s){2,}/, '\1')
|
||||||
|
|
|
@ -1368,23 +1368,6 @@ describe CookedPostProcessor do
|
||||||
expect(reply.raw).to eq("and this is the third reply")
|
expect(reply.raw).to eq("and this is the third reply")
|
||||||
end
|
end
|
||||||
|
|
||||||
it "works with click counters" do
|
|
||||||
post = Fabricate(:post,
|
|
||||||
topic: topic,
|
|
||||||
raw: "[Discourse](https://www.discourse.org) is amazing!",
|
|
||||||
cooked: %{<p><a href="https://www.discourse.org">Discourse <span class="badge badge-notification clicks" title="1 click">1</span></a> is amazing!</p>}
|
|
||||||
)
|
|
||||||
|
|
||||||
reply = Fabricate(:post,
|
|
||||||
topic: topic,
|
|
||||||
raw: "[quote]\n[Discourse](https://www.discourse.org) is amazing!\n[/quote]\nIt sure is :+1:"
|
|
||||||
)
|
|
||||||
|
|
||||||
CookedPostProcessor.new(reply).remove_full_quote_on_direct_reply
|
|
||||||
|
|
||||||
expect(reply.raw).to eq("It sure is :+1:")
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue