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

should fix #165

Browse Source
This commit is contained in:
Toks
2013-03-30 13:54:01 -04:00
parent f6bfdacd3d
commit d45db380e9
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/logical/d_text.rb
View File

@@ -19,6 +19,7 @@ class DText
str.gsub!(/\[i\](.+?)\[\/i\]/i, '<em>\1</em>') str.gsub!(/\[i\](.+?)\[\/i\]/i, '<em>\1</em>')
str.gsub!(/\[s\](.+?)\[\/s\]/i, '<s>\1</s>') str.gsub!(/\[s\](.+?)\[\/s\]/i, '<s>\1</s>')
str.gsub!(/\[u\](.+?)\[\/u\]/i, '<u>\1</u>') str.gsub!(/\[u\](.+?)\[\/u\]/i, '<u>\1</u>')
str.gsub!(/\[spoilers?\](.+?)\[\/spoilers?\]/i, '<span class="spoiler">\1</span>')
str = parse_links(str) str = parse_links(str)
str = parse_aliased_wiki_links(str) str = parse_aliased_wiki_links(str)
@@ -127,8 +128,6 @@ class DText
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*\[code\]\s*/m, "\n\n[code]\n\n") str.gsub!(/\s*\[code\]\s*/m, "\n\n[code]\n\n")
str.gsub!(/\s*\[\/code\]\s*/m, "\n\n[/code]\n\n") str.gsub!(/\s*\[\/code\]\s*/m, "\n\n[/code]\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")
@@ -178,16 +177,6 @@ class DText
flags[:code] = false flags[:code] = false
'</pre>' '</pre>'
when /\[spoilers?\](?!\])/
stack << "div"
'<div class="spoiler">'
when /\[\/spoilers?\]/
if stack.last == "div"
stack.pop
'</div>'
end
else else
if flags[:code] if flags[:code]
block block