Merge branch 'v3'

This commit is contained in:
Zixaphir 2014-03-11 15:23:03 -07:00
commit fd80574fc3
4 changed files with 6 additions and 6 deletions

View File

@ -5934,7 +5934,7 @@
$.addClass.apply($, [root].concat(__slice.call(thread.OP.highlights)));
}
thumb = root.firstElementChild;
if (data.spoiler && !Conf['Reveal Spoilers']) {
if (data.spoiler && !Conf['Reveal Spoiler Thumbnails']) {
src = "" + staticPath + "spoiler";
if (spoilerRange = Build.spoilerRange[thread.board]) {
src += ("-" + thread.board) + Math.floor(1 + spoilerRange * Math.random());
@ -11126,7 +11126,7 @@
RevealSpoilers = {
init: function() {
if (!Conf['Reveal Spoilers']) {
if (!Conf['Reveal Spoiler Thumbnails']) {
return;
}
return Post.callbacks.push({

View File

@ -5992,7 +5992,7 @@
$.addClass.apply($, [root].concat(__slice.call(thread.OP.highlights)));
}
thumb = root.firstElementChild;
if (data.spoiler && !Conf['Reveal Spoilers']) {
if (data.spoiler && !Conf['Reveal Spoiler Thumbnails']) {
src = "" + staticPath + "spoiler";
if (spoilerRange = Build.spoilerRange[thread.board]) {
src += ("-" + thread.board) + Math.floor(1 + spoilerRange * Math.random());
@ -11140,7 +11140,7 @@
RevealSpoilers = {
init: function() {
if (!Conf['Reveal Spoilers']) {
if (!Conf['Reveal Spoiler Thumbnails']) {
return;
}
return Post.callbacks.push({

View File

@ -258,7 +258,7 @@ Build =
$.addClass root, thread.OP.highlights... if thread.OP.highlights.length
thumb = root.firstElementChild
if data.spoiler and !Conf['Reveal Spoilers']
if data.spoiler and !Conf['Reveal Spoiler Thumbnails']
src = "#{staticPath}spoiler"
if spoilerRange = Build.spoilerRange[thread.board]
# Randomize the spoiler image.

View File

@ -1,6 +1,6 @@
RevealSpoilers =
init: ->
return if !Conf['Reveal Spoilers']
return if !Conf['Reveal Spoiler Thumbnails']
Post.callbacks.push
cb: @node