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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-04-05 01:03:36 -07:00
commit 6760dcf09f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8782,6 +8782,7 @@
} }
if (QR.captcha.isEnabled && /captcha|verification/i.test(el.textContent)) { if (QR.captcha.isEnabled && /captcha|verification/i.test(el.textContent)) {
QR.captcha.nodes.input.focus(); QR.captcha.nodes.input.focus();
QR.captcha.setup();
if (Conf['Captcha Warning Notifications'] && !d.hidden) { if (Conf['Captcha Warning Notifications'] && !d.hidden) {
QR.notify(el); QR.notify(el);
} else { } else {
@ -9493,10 +9494,6 @@
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({
@ -9955,6 +9952,9 @@
$.rmClass(QR.nodes.el, 'dump'); $.rmClass(QR.nodes.el, 'dump');
} else if (this === QR.selected) { } else if (this === QR.selected) {
(QR.posts[index - 1] || QR.posts[index + 1]).select(); (QR.posts[index - 1] || QR.posts[index + 1]).select();
if (QR.captcha.isEnabled) {
QR.captcha.setup();
}
} }
QR.posts.splice(index, 1); QR.posts.splice(index, 1);
return QR.status(); return QR.status();

8
builds/crx/script.js
View File

@ -8836,6 +8836,7 @@
} }
if (QR.captcha.isEnabled && /captcha|verification/i.test(el.textContent)) { if (QR.captcha.isEnabled && /captcha|verification/i.test(el.textContent)) {
QR.captcha.nodes.input.focus(); QR.captcha.nodes.input.focus();
QR.captcha.setup();
if (Conf['Captcha Warning Notifications'] && !d.hidden) { if (Conf['Captcha Warning Notifications'] && !d.hidden) {
QR.notify(el); QR.notify(el);
} else { } else {
@ -9537,10 +9538,6 @@
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({
@ -9993,6 +9990,9 @@
$.rmClass(QR.nodes.el, 'dump'); $.rmClass(QR.nodes.el, 'dump');
} else if (this === QR.selected) { } else if (this === QR.selected) {
(QR.posts[index - 1] || QR.posts[index + 1]).select(); (QR.posts[index - 1] || QR.posts[index + 1]).select();
if (QR.captcha.isEnabled) {
QR.captcha.setup();
}
} }
QR.posts.splice(index, 1); QR.posts.splice(index, 1);
return QR.status(); return QR.status();

4
src/Posting/QR.coffee
View File

@ -139,6 +139,7 @@ QR =
if QR.captcha.isEnabled and /captcha|verification/i.test el.textContent if QR.captcha.isEnabled and /captcha|verification/i.test el.textContent
# Focus the captcha input on captcha error. # Focus the captcha input on captcha error.
QR.captcha.nodes.input.focus() QR.captcha.nodes.input.focus()
QR.captcha.setup()
if Conf['Captcha Warning Notifications'] and !d.hidden if Conf['Captcha Warning Notifications'] and !d.hidden
QR.notify el QR.notify el
else else
@ -814,9 +815,6 @@ 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}

2
src/Posting/QR.post.coffee
View File

@ -80,6 +80,8 @@ QR.post = class
$.rmClass QR.nodes.el, 'dump' $.rmClass QR.nodes.el, 'dump'
else if @ is QR.selected else if @ is QR.selected
(QR.posts[index-1] or QR.posts[index+1]).select() (QR.posts[index-1] or QR.posts[index+1]).select()
if QR.captcha.isEnabled
QR.captcha.setup()
QR.posts.splice index, 1 QR.posts.splice index, 1
QR.status() QR.status()
delete: -> delete: ->