Merge branch 'v3'

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-03-15 15:37:03 -07:00
commit e499adf735
4 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.9.4 - 2014-03-14 * appchan x - Version 2.9.4 - 2014-03-15
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -25,7 +25,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.9.4 - 2014-03-14 * appchan x - Version 2.9.4 - 2014-03-15
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -11163,6 +11163,7 @@
return; return;
} }
return Post.callbacks.push({ return Post.callbacks.push({
name: 'Reveal Spoiler Thumbnails',
cb: this.node cb: this.node
}); });
}, },

View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.9.4 - 2014-03-14 * appchan x - Version 2.9.4 - 2014-03-15
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -11177,6 +11177,7 @@
return; return;
} }
return Post.callbacks.push({ return Post.callbacks.push({
name: 'Reveal Spoiler Thumbnails',
cb: this.node cb: this.node
}); });
}, },

View File

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