jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix #405

Browse Source
This commit is contained in:
albert
2013-02-19 13:46:14 -05:00
parent 490d36e2a1
commit e725455dea
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/logical/d_text.rb
View File

@@ -14,7 +14,6 @@ class DText
str.gsub!(/&/, "&") str.gsub!(/&/, "&")
str.gsub!(/</, "&lt;") str.gsub!(/</, "&lt;")
str.gsub!(/>/, "&gt;") str.gsub!(/>/, "&gt;")
str.gsub!(/(?<!\[)\[spoilers?\](.+?)(?:\[\/?spoilers?\]|$)/m, '<span class="spoiler">\1</span>')
str.gsub!(/\n/m, "<br>") str.gsub!(/\n/m, "<br>")
str.gsub!(/\[b\](.+?)\[\/b\]/i, '<strong>\1</strong>') str.gsub!(/\[b\](.+?)\[\/b\]/i, '<strong>\1</strong>')
str.gsub!(/\[i\](.+?)\[\/i\]/i, '<em>\1</em>') str.gsub!(/\[i\](.+?)\[\/i\]/i, '<em>\1</em>')
@@ -122,6 +121,8 @@ class DText
unless options[:inline] unless options[:inline]
str.gsub!(/\s*\[quote\]\s*/m, "\n\n[quote]\n\n") str.gsub!(/\s*\[quote\]\s*/m, "\n\n[quote]\n\n")
str.gsub!(/\s*\[\/quote\]\s*/m, "\n\n[/quote]\n\n") str.gsub!(/\s*\[\/quote\]\s*/m, "\n\n[/quote]\n\n")
str.gsub!(/\s*\[spoilers?\](?!\])\s*/m, "\n\n[spoiler]\n\n")
str.gsub!(/\s*\[\/spoilers?\]\s*/m, "\n\n[/spoiler]\n\n")
end end
str.gsub!(/(?:\r?\n){3,}/, "\n\n") str.gsub!(/(?:\r?\n){3,}/, "\n\n")
@@ -162,6 +163,16 @@ class DText
"" ""
end end
when /\[spoilers?\](?!\])/
stack << "div"
'<div class="spoiler">'
when /\[\/spoilers?\]/
if stack.last == "div"
stack.pop
'</div>'
end
else else
'<p>' + parse_inline(block) + "</p>" '<p>' + parse_inline(block) + "</p>"
end end