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

spoiler tags are now inline

Browse Source
This commit is contained in:
albert
2011-10-24 13:49:45 -04:00
parent d2177512ea
commit 1fc7907374
4 changed files with 254 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/common/spoiler.css.scss
View File

@@ -1,14 +1,12 @@
.spoiler {
color: black;
background: black;
cursor: text;
display: block;
}
.spoiler a {
color: black;
}
.spoiler:hover {
.spoiler a:hover {
color: white;
}

2
app/logical/d_text.rb
View File

@@ -14,10 +14,10 @@ class DText
str.gsub!(/&/, "&")
str.gsub!(/</, "&lt;")
str.gsub!(/>/, "&gt;")
str.gsub!(/(?<!\[)\[spoilers?\](.+?)(?:\[\/?spoilers?\]|$)/m, '<span class="spoiler">\1</span>')
str.gsub!(/\n/m, "<br>")
str.gsub!(/\[b\](.+?)\[\/b\]/i, '<strong>\1</strong>')
str.gsub!(/\[i\](.+?)\[\/i\]/i, '<em>\1</em>')
str.gsub!(/\[spoilers?\](.+?)(?:\[\/?spoilers?\]|$)/, '<span class="spoiler">\1</span>')
str = parse_links(str)
str = parse_aliased_wiki_links(str)

421
db/development_structure.sql
View File

File diff suppressed because it is too large Load Diff

14
test/unit/dtext_test.rb
View File

@@ -17,10 +17,11 @@ class DTextTest < ActiveSupport::TestCase
end
def test_spoilers
assert_equal("", p("this is [spoiler]an inline spoiler[/spoiler]."))
assert_equal("", p("this is\n\n[spoiler]\na block spoiler\n[/spoiler]."))
assert_equal("", p("[spoiler]this is a spoiler with no closing tag\nnew text"))
assert_equal("", p("[spoiler]this is [spoiler]a nested[/spoiler] spoiler[/spoiler]"))
assert_equal("<p>this is <span class=\"spoiler\">an inline spoiler</span>.</p>", p("this is [spoiler]an inline spoiler[/spoiler]."))
assert_equal("<p>this is</p><p><span class=\"spoiler\"><br>a block spoiler</span><br>[/spoiler].</p>", p("this is\n\n[spoiler]\na block spoiler\n[/spoiler]."))
assert_equal("<p><span class=\"spoiler\">this is a spoiler with no closing tag</span></p><p>new text</p>", p("[spoiler]this is a spoiler with no closing tag\n\nnew text"))
assert_equal("<p><span class=\"spoiler\">this is a spoiler with no closing tag</span><br>new text</p>", p("[spoiler]this is a spoiler with no closing tag\nnew text"))
assert_equal("<p><span class=\"spoiler\">this is </span>a nested[/spoiler] spoiler[/spoiler]</p>", p("[spoiler]this is [spoiler]a nested[/spoiler] spoiler[/spoiler]"))
end
def test_paragraphs
@@ -78,11 +79,6 @@ class DTextTest < ActiveSupport::TestCase
assert_equal('<p><a href="/posts?tags=%3C3">&lt;3</a></p>', p("{{<3}}"))
end
def test_missing_spoiler_tags
assert_equal('<div class="spoiler"><p>testing</p></div>', p('[spoiler]testing'))
assert_equal('<div class="spoiler"><div class="spoiler"><p>testing</p></div></div>', p('[spoiler][spoiler]testing[/spoiler]'))
end
def test_extra_newlines
assert_equal('<p>a</p><p>b</p>', p("a\n\n\n\n\n\n\nb\n\n\n\n"))
end