github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-25 14:08:54 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

FIX: When mutating a string to build a diff. Duplicate it first ()

Browse Source
This commit is contained in:
Roman Rizzi 2019-05-06 13:20:10 -03:00 committed by GitHub
parent e67ba8517d
commit 20d4093a67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions

17
lib/discourse_diff.rb

@ -176,24 +176,25 @@ class DiscourseDiff
end
def add_class_or_wrap_in_tags(html_or_text, klass)
index_of_next_chevron = html_or_text.index(">")
if html_or_text.length > 0 && html_or_text[0] == '<' && index_of_next_chevron
index_of_class = html_or_text.index("class=")
dupped_html_or_text = html_or_text.dup
index_of_next_chevron = dupped_html_or_text.index(">")
if dupped_html_or_text.length > 0 && dupped_html_or_text[0] == '<' && index_of_next_chevron
index_of_class = dupped_html_or_text.index("class=")
if index_of_class.nil? || index_of_class > index_of_next_chevron
# we do not have a class for the current tag
# add it right before the ">"
html_or_text.insert(index_of_next_chevron, " class=\"diff-#{klass}\"")
dupped_html_or_text.insert(index_of_next_chevron, " class=\"diff-#{klass}\"")
else
# we have a class, insert it at the beginning if not already present
classes = html_or_text[/class=(["'])([^\1]*)\1/, 2]
classes = dupped_html_or_text[/class=(["'])([^\1]*)\1/, 2]
if classes.include?("diff-#{klass}")
html_or_text
dupped_html_or_text
else
html_or_text.insert(index_of_class + "class=".length + 1, "diff-#{klass} ")
dupped_html_or_text.insert(index_of_class + "class=".length + 1, "diff-#{klass} ")
end
end
else
"<#{klass}>#{html_or_text}</#{klass}>"
"<#{klass}>#{dupped_html_or_text}</#{klass}>"
end
end