Merge branch 'v3'
Conflicts: LICENSE builds/appchan-x.user.js builds/crx/script.js
This commit is contained in:
commit
af843c0c6d
2
LICENSE
2
LICENSE
@ -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.
|
||||
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
// ==/UserScript==
|
||||
|
||||
/*
|
||||
* appchan x - Version 2.9.12 - 2014-04-04
|
||||
* appchan x - Version 2.9.12 - 2014-04-05
|
||||
*
|
||||
* Licensed under the MIT license.
|
||||
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
|
||||
@ -9493,6 +9493,10 @@
|
||||
if (!(Conf['Persistent QR'] || QR.cooldown.auto)) {
|
||||
QR.close();
|
||||
} else {
|
||||
if (QR.posts.length > 1) {
|
||||
QR.captcha.setup();
|
||||
QR.captcha.afterSetup();
|
||||
}
|
||||
post.rm();
|
||||
}
|
||||
QR.cooldown.set({
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// 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.
|
||||
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
|
||||
@ -9537,6 +9537,10 @@
|
||||
if (!(Conf['Persistent QR'] || QR.cooldown.auto)) {
|
||||
QR.close();
|
||||
} else {
|
||||
if (QR.posts.length > 1) {
|
||||
QR.captcha.setup();
|
||||
QR.captcha.afterSetup();
|
||||
}
|
||||
post.rm();
|
||||
}
|
||||
QR.cooldown.set({
|
||||
|
||||
@ -814,6 +814,9 @@ QR =
|
||||
unless Conf['Persistent QR'] or QR.cooldown.auto
|
||||
QR.close()
|
||||
else
|
||||
if QR.posts.length > 1
|
||||
QR.captcha.setup()
|
||||
QR.captcha.afterSetup()
|
||||
post.rm()
|
||||
|
||||
QR.cooldown.set {req, post, isReply, threadID}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user