Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v3'

Browse Source 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-04-05 00:47:29 -07:00
commit af843c0c6d
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.9.12 - 2014-04-04 * appchan x - Version 2.9.12 - 2014-04-05
* *
* 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

6
builds/appchan-x.user.js
View File

@ -25,7 +25,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.9.12 - 2014-04-04 * appchan x - Version 2.9.12 - 2014-04-05
* *
* 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
@ -9493,6 +9493,10 @@
if (!(Conf['Persistent QR'] || QR.cooldown.auto)) { if (!(Conf['Persistent QR'] || QR.cooldown.auto)) {
QR.close(); QR.close();
} else { } else {
if (QR.posts.length > 1) {
QR.captcha.setup();
QR.captcha.afterSetup();
}
post.rm(); post.rm();
} }
QR.cooldown.set({ QR.cooldown.set({

6
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.9.12 - 2014-04-04 * appchan x - Version 2.9.12 - 2014-04-05
* *
* 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
@ -9537,6 +9537,10 @@
if (!(Conf['Persistent QR'] || QR.cooldown.auto)) { if (!(Conf['Persistent QR'] || QR.cooldown.auto)) {
QR.close(); QR.close();
} else { } else {
if (QR.posts.length > 1) {
QR.captcha.setup();
QR.captcha.afterSetup();
}
post.rm(); post.rm();
} }
QR.cooldown.set({ QR.cooldown.set({

3
src/Posting/QR.coffee
View File

@ -814,6 +814,9 @@ QR =
unless Conf['Persistent QR'] or QR.cooldown.auto unless Conf['Persistent QR'] or QR.cooldown.auto
QR.close() QR.close()
else else
if QR.posts.length > 1
QR.captcha.setup()
QR.captcha.afterSetup()
post.rm() post.rm()
QR.cooldown.set {req, post, isReply, threadID} QR.cooldown.set {req, post, isReply, threadID}