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

Release 4chan X v1.11.17.3.

Browse Source
This commit is contained in:
ccd0 2015-11-17 22:28:50 -08:00
parent 9738a4f0d0
commit ab97078638
13 changed files with 84 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.17 ### v1.11.17
**v1.11.17.3** *(2015-11-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.3/builds/4chan-X-noupdate.crx "Chromium version")]
- Minor captcha fixes.
**v1.11.17.2** *(2015-11-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.2/builds/4chan-X-noupdate.crx "Chromium version")] **v1.11.17.2** *(2015-11-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.2/builds/4chan-X-noupdate.crx "Chromium version")]
- Merge v1.11.16.9: Bring back scrolling prevention when captcha is focused. - Merge v1.11.16.9: Bring back scrolling prevention when captcha is focused.

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

2
builds/4chan-X-beta.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.11.17.2 // @version 1.11.17.3
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

44
builds/4chan-X-beta.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.11.17.2 // @version 1.11.17.3
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.11.17.2', VERSION: '1.11.17.3',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -7198,9 +7198,6 @@
el = err; el = err;
el.removeAttribute('style'); el.removeAttribute('style');
} }
if (QR.captcha.isEnabled && /captcha|verification/i.test(el.textContent)) {
QR.captcha.setup(true);
}
notice = new Notice('warning', el); notice = new Notice('warning', el);
QR.notifications.push(notice); QR.notifications.push(notice);
if (!Header.areNotificationsEnabled) { if (!Header.areNotificationsEnabled) {
@ -7715,6 +7712,7 @@
captcha = QR.captcha.getOne(); captcha = QR.captcha.getOne();
if (!captcha) { if (!captcha) {
err = 'No valid captcha.'; err = 'No valid captcha.';
QR.captcha.setup(true);
} }
} }
QR.cleanNotifications(); QR.cleanNotifications();
@ -7848,12 +7846,12 @@
} else { } else {
QR.cooldown.addDelay(post, seconds); QR.cooldown.addDelay(post, seconds);
} }
QR.captcha.setup(d.activeElement === QR.nodes.status);
} else { } else {
QR.cooldown.auto = false; QR.cooldown.auto = false;
} }
QR.status(); QR.status();
QR.error(err); QR.error(err);
QR.captcha.setup(true);
return; return;
} }
h1 = $('h1', resDoc); h1 = $('h1', resDoc);
@ -7897,7 +7895,7 @@
QR.close(); QR.close();
} else { } else {
post.rm(); post.rm();
QR.captcha.setup(d.activeElement === QR.nodes.status); QR.captcha.setup(true);
} }
QR.cooldown.add(threadID, postID); QR.cooldown.add(threadID, postID);
URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
@ -8293,11 +8291,12 @@
onNewPost: function() {}, onNewPost: function() {},
onPostChange: function() {}, onPostChange: function() {},
setup: function(focus, force) { setup: function(focus, force) {
var ref;
if (!(this.isEnabled && (force || this.needed()))) { if (!(this.isEnabled && (force || this.needed()))) {
return; return;
} }
this.create(); this.create();
if (focus) { if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
return this.nodes.input.focus(); return this.nodes.input.focus();
} }
}, },
@ -8381,6 +8380,9 @@
response: response, response: response,
timeout: this.timeout timeout: this.timeout
}); });
this.captchas.sort(function(a, b) {
return a.timeout - b.timeout;
});
this.count(); this.count();
this.destroy(); this.destroy();
this.setup(false, true); this.setup(false, true);
@ -8446,7 +8448,11 @@
} }
})(); })();
this.nodes.input.placeholder = placeholder; this.nodes.input.placeholder = placeholder;
return this.nodes.input.alt = count; this.nodes.input.alt = count;
clearTimeout(this.timer);
if (count) {
return this.timer = setTimeout(this.clear.bind(this), this.captchas[0].timeout - Date.now());
}
}, },
reload: function(focus) { reload: function(focus) {
$.globalEval('if (window.Recaptcha.type === "image") {\n window.Recaptcha.reload();\n} else {\n window.Recaptcha.switch_type("image");\n}\nwindow.Recaptcha.should_focus = false;'); $.globalEval('if (window.Recaptcha.type === "image") {\n window.Recaptcha.reload();\n} else {\n window.Recaptcha.switch_type("image");\n}\nwindow.Recaptcha.should_focus = false;');
@ -8538,7 +8544,6 @@
}); });
} }
}, },
shouldFocus: false,
timeouts: {}, timeouts: {},
postsCount: 0, postsCount: 0,
noscriptURL: function() { noscriptURL: function() {
@ -8580,12 +8585,12 @@
} }
}, },
setup: function(focus, force) { setup: function(focus, force) {
var iframe; var iframe, ref;
if (!(this.isEnabled && (this.needed() || force))) { if (!(this.isEnabled && (this.needed() || force))) {
return; return;
} }
if (focus && !QR.inBubble()) { if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
this.shouldFocus = true; this.nodes.counter.focus();
} }
if (this.timeouts.destroy) { if (this.timeouts.destroy) {
clearTimeout(this.timeouts.destroy); clearTimeout(this.timeouts.destroy);
@ -8593,10 +8598,9 @@
return this.reload(); return this.reload();
} }
if (this.nodes.container) { if (this.nodes.container) {
if (this.shouldFocus && (iframe = $('iframe', this.nodes.container))) { if (d.activeElement === this.nodes.counter && (iframe = $('iframe', this.nodes.container))) {
iframe.focus(); iframe.focus();
QR.focus(); QR.focus();
delete this.shouldFocus;
} }
return; return;
} }
@ -8649,10 +8653,9 @@
QR.nodes.el.style.top = null; QR.nodes.el.style.top = null;
QR.nodes.el.style.bottom = '0px'; QR.nodes.el.style.bottom = '0px';
} }
if (this.shouldFocus) { if (d.activeElement === this.nodes.counter) {
iframe.focus(); iframe.focus();
} }
this.shouldFocus = false;
return $.global(function() { return $.global(function() {
var f; var f;
f = document.querySelector('#qr iframe'); f = document.querySelector('#qr iframe');
@ -8712,13 +8715,16 @@
response: token || $('textarea', this.nodes.container).value, response: token || $('textarea', this.nodes.container).value,
timeout: Date.now() + this.lifetime timeout: Date.now() + this.lifetime
}); });
this.captchas.sort(function(a, b) {
return a.timeout - b.timeout;
});
$.set('captchas', this.captchas); $.set('captchas', this.captchas);
this.count(); this.count();
focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src); focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src);
if (this.needed()) { if (this.needed()) {
if (focus) { if (focus) {
if (QR.cooldown.auto || Conf['Post on Captcha Completion']) { if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
this.shouldFocus = true; this.nodes.counter.focus();
} else { } else {
QR.nodes.status.focus(); QR.nodes.status.focus();
} }
@ -8760,7 +8766,7 @@
this.captchas = this.captchas.slice(i); this.captchas = this.captchas.slice(i);
this.count(); this.count();
$.set('captchas', this.captchas); $.set('captchas', this.captchas);
return this.setup(d.activeElement === QR.nodes.status); return this.setup(true);
}, },
count: function() { count: function() {
this.nodes.counter.textContent = "Captchas: " + this.captchas.length; this.nodes.counter.textContent = "Captchas: " + this.captchas.length;

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

44
builds/4chan-X-noupdate.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.11.17.2 // @version 1.11.17.3
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.11.17.2', VERSION: '1.11.17.3',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -7198,9 +7198,6 @@
el = err; el = err;
el.removeAttribute('style'); el.removeAttribute('style');
} }
if (QR.captcha.isEnabled && /captcha|verification/i.test(el.textContent)) {
QR.captcha.setup(true);
}
notice = new Notice('warning', el); notice = new Notice('warning', el);
QR.notifications.push(notice); QR.notifications.push(notice);
if (!Header.areNotificationsEnabled) { if (!Header.areNotificationsEnabled) {
@ -7715,6 +7712,7 @@
captcha = QR.captcha.getOne(); captcha = QR.captcha.getOne();
if (!captcha) { if (!captcha) {
err = 'No valid captcha.'; err = 'No valid captcha.';
QR.captcha.setup(true);
} }
} }
QR.cleanNotifications(); QR.cleanNotifications();
@ -7848,12 +7846,12 @@
} else { } else {
QR.cooldown.addDelay(post, seconds); QR.cooldown.addDelay(post, seconds);
} }
QR.captcha.setup(d.activeElement === QR.nodes.status);
} else { } else {
QR.cooldown.auto = false; QR.cooldown.auto = false;
} }
QR.status(); QR.status();
QR.error(err); QR.error(err);
QR.captcha.setup(true);
return; return;
} }
h1 = $('h1', resDoc); h1 = $('h1', resDoc);
@ -7897,7 +7895,7 @@
QR.close(); QR.close();
} else { } else {
post.rm(); post.rm();
QR.captcha.setup(d.activeElement === QR.nodes.status); QR.captcha.setup(true);
} }
QR.cooldown.add(threadID, postID); QR.cooldown.add(threadID, postID);
URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
@ -8293,11 +8291,12 @@
onNewPost: function() {}, onNewPost: function() {},
onPostChange: function() {}, onPostChange: function() {},
setup: function(focus, force) { setup: function(focus, force) {
var ref;
if (!(this.isEnabled && (force || this.needed()))) { if (!(this.isEnabled && (force || this.needed()))) {
return; return;
} }
this.create(); this.create();
if (focus) { if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
return this.nodes.input.focus(); return this.nodes.input.focus();
} }
}, },
@ -8381,6 +8380,9 @@
response: response, response: response,
timeout: this.timeout timeout: this.timeout
}); });
this.captchas.sort(function(a, b) {
return a.timeout - b.timeout;
});
this.count(); this.count();
this.destroy(); this.destroy();
this.setup(false, true); this.setup(false, true);
@ -8446,7 +8448,11 @@
} }
})(); })();
this.nodes.input.placeholder = placeholder; this.nodes.input.placeholder = placeholder;
return this.nodes.input.alt = count; this.nodes.input.alt = count;
clearTimeout(this.timer);
if (count) {
return this.timer = setTimeout(this.clear.bind(this), this.captchas[0].timeout - Date.now());
}
}, },
reload: function(focus) { reload: function(focus) {
$.globalEval('if (window.Recaptcha.type === "image") {\n window.Recaptcha.reload();\n} else {\n window.Recaptcha.switch_type("image");\n}\nwindow.Recaptcha.should_focus = false;'); $.globalEval('if (window.Recaptcha.type === "image") {\n window.Recaptcha.reload();\n} else {\n window.Recaptcha.switch_type("image");\n}\nwindow.Recaptcha.should_focus = false;');
@ -8538,7 +8544,6 @@
}); });
} }
}, },
shouldFocus: false,
timeouts: {}, timeouts: {},
postsCount: 0, postsCount: 0,
noscriptURL: function() { noscriptURL: function() {
@ -8580,12 +8585,12 @@
} }
}, },
setup: function(focus, force) { setup: function(focus, force) {
var iframe; var iframe, ref;
if (!(this.isEnabled && (this.needed() || force))) { if (!(this.isEnabled && (this.needed() || force))) {
return; return;
} }
if (focus && !QR.inBubble()) { if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
this.shouldFocus = true; this.nodes.counter.focus();
} }
if (this.timeouts.destroy) { if (this.timeouts.destroy) {
clearTimeout(this.timeouts.destroy); clearTimeout(this.timeouts.destroy);
@ -8593,10 +8598,9 @@
return this.reload(); return this.reload();
} }
if (this.nodes.container) { if (this.nodes.container) {
if (this.shouldFocus && (iframe = $('iframe', this.nodes.container))) { if (d.activeElement === this.nodes.counter && (iframe = $('iframe', this.nodes.container))) {
iframe.focus(); iframe.focus();
QR.focus(); QR.focus();
delete this.shouldFocus;
} }
return; return;
} }
@ -8649,10 +8653,9 @@
QR.nodes.el.style.top = null; QR.nodes.el.style.top = null;
QR.nodes.el.style.bottom = '0px'; QR.nodes.el.style.bottom = '0px';
} }
if (this.shouldFocus) { if (d.activeElement === this.nodes.counter) {
iframe.focus(); iframe.focus();
} }
this.shouldFocus = false;
return $.global(function() { return $.global(function() {
var f; var f;
f = document.querySelector('#qr iframe'); f = document.querySelector('#qr iframe');
@ -8712,13 +8715,16 @@
response: token || $('textarea', this.nodes.container).value, response: token || $('textarea', this.nodes.container).value,
timeout: Date.now() + this.lifetime timeout: Date.now() + this.lifetime
}); });
this.captchas.sort(function(a, b) {
return a.timeout - b.timeout;
});
$.set('captchas', this.captchas); $.set('captchas', this.captchas);
this.count(); this.count();
focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src); focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src);
if (this.needed()) { if (this.needed()) {
if (focus) { if (focus) {
if (QR.cooldown.auto || Conf['Post on Captcha Completion']) { if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
this.shouldFocus = true; this.nodes.counter.focus();
} else { } else {
QR.nodes.status.focus(); QR.nodes.status.focus();
} }
@ -8760,7 +8766,7 @@
this.captchas = this.captchas.slice(i); this.captchas = this.captchas.slice(i);
this.count(); this.count();
$.set('captchas', this.captchas); $.set('captchas', this.captchas);
return this.setup(d.activeElement === QR.nodes.status); return this.setup(true);
}, },
count: function() { count: function() {
this.nodes.counter.textContent = "Captchas: " + this.captchas.length; this.nodes.counter.textContent = "Captchas: " + this.captchas.length;

BIN
builds/4chan-X.crx
View File

Binary file not shown.

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.11.17.2 // @version 1.11.17.3
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

44
builds/4chan-X.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.11.17.2 // @version 1.11.17.3
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.11.17.2', VERSION: '1.11.17.3',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -7198,9 +7198,6 @@
el = err; el = err;
el.removeAttribute('style'); el.removeAttribute('style');
} }
if (QR.captcha.isEnabled && /captcha|verification/i.test(el.textContent)) {
QR.captcha.setup(true);
}
notice = new Notice('warning', el); notice = new Notice('warning', el);
QR.notifications.push(notice); QR.notifications.push(notice);
if (!Header.areNotificationsEnabled) { if (!Header.areNotificationsEnabled) {
@ -7715,6 +7712,7 @@
captcha = QR.captcha.getOne(); captcha = QR.captcha.getOne();
if (!captcha) { if (!captcha) {
err = 'No valid captcha.'; err = 'No valid captcha.';
QR.captcha.setup(true);
} }
} }
QR.cleanNotifications(); QR.cleanNotifications();
@ -7848,12 +7846,12 @@
} else { } else {
QR.cooldown.addDelay(post, seconds); QR.cooldown.addDelay(post, seconds);
} }
QR.captcha.setup(d.activeElement === QR.nodes.status);
} else { } else {
QR.cooldown.auto = false; QR.cooldown.auto = false;
} }
QR.status(); QR.status();
QR.error(err); QR.error(err);
QR.captcha.setup(true);
return; return;
} }
h1 = $('h1', resDoc); h1 = $('h1', resDoc);
@ -7897,7 +7895,7 @@
QR.close(); QR.close();
} else { } else {
post.rm(); post.rm();
QR.captcha.setup(d.activeElement === QR.nodes.status); QR.captcha.setup(true);
} }
QR.cooldown.add(threadID, postID); QR.cooldown.add(threadID, postID);
URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
@ -8293,11 +8291,12 @@
onNewPost: function() {}, onNewPost: function() {},
onPostChange: function() {}, onPostChange: function() {},
setup: function(focus, force) { setup: function(focus, force) {
var ref;
if (!(this.isEnabled && (force || this.needed()))) { if (!(this.isEnabled && (force || this.needed()))) {
return; return;
} }
this.create(); this.create();
if (focus) { if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
return this.nodes.input.focus(); return this.nodes.input.focus();
} }
}, },
@ -8381,6 +8380,9 @@
response: response, response: response,
timeout: this.timeout timeout: this.timeout
}); });
this.captchas.sort(function(a, b) {
return a.timeout - b.timeout;
});
this.count(); this.count();
this.destroy(); this.destroy();
this.setup(false, true); this.setup(false, true);
@ -8446,7 +8448,11 @@
} }
})(); })();
this.nodes.input.placeholder = placeholder; this.nodes.input.placeholder = placeholder;
return this.nodes.input.alt = count; this.nodes.input.alt = count;
clearTimeout(this.timer);
if (count) {
return this.timer = setTimeout(this.clear.bind(this), this.captchas[0].timeout - Date.now());
}
}, },
reload: function(focus) { reload: function(focus) {
$.globalEval('if (window.Recaptcha.type === "image") {\n window.Recaptcha.reload();\n} else {\n window.Recaptcha.switch_type("image");\n}\nwindow.Recaptcha.should_focus = false;'); $.globalEval('if (window.Recaptcha.type === "image") {\n window.Recaptcha.reload();\n} else {\n window.Recaptcha.switch_type("image");\n}\nwindow.Recaptcha.should_focus = false;');
@ -8538,7 +8544,6 @@
}); });
} }
}, },
shouldFocus: false,
timeouts: {}, timeouts: {},
postsCount: 0, postsCount: 0,
noscriptURL: function() { noscriptURL: function() {
@ -8580,12 +8585,12 @@
} }
}, },
setup: function(focus, force) { setup: function(focus, force) {
var iframe; var iframe, ref;
if (!(this.isEnabled && (this.needed() || force))) { if (!(this.isEnabled && (this.needed() || force))) {
return; return;
} }
if (focus && !QR.inBubble()) { if (focus && ((ref = d.activeElement) === QR.nodes.status || ref === d.body)) {
this.shouldFocus = true; this.nodes.counter.focus();
} }
if (this.timeouts.destroy) { if (this.timeouts.destroy) {
clearTimeout(this.timeouts.destroy); clearTimeout(this.timeouts.destroy);
@ -8593,10 +8598,9 @@
return this.reload(); return this.reload();
} }
if (this.nodes.container) { if (this.nodes.container) {
if (this.shouldFocus && (iframe = $('iframe', this.nodes.container))) { if (d.activeElement === this.nodes.counter && (iframe = $('iframe', this.nodes.container))) {
iframe.focus(); iframe.focus();
QR.focus(); QR.focus();
delete this.shouldFocus;
} }
return; return;
} }
@ -8649,10 +8653,9 @@
QR.nodes.el.style.top = null; QR.nodes.el.style.top = null;
QR.nodes.el.style.bottom = '0px'; QR.nodes.el.style.bottom = '0px';
} }
if (this.shouldFocus) { if (d.activeElement === this.nodes.counter) {
iframe.focus(); iframe.focus();
} }
this.shouldFocus = false;
return $.global(function() { return $.global(function() {
var f; var f;
f = document.querySelector('#qr iframe'); f = document.querySelector('#qr iframe');
@ -8712,13 +8715,16 @@
response: token || $('textarea', this.nodes.container).value, response: token || $('textarea', this.nodes.container).value,
timeout: Date.now() + this.lifetime timeout: Date.now() + this.lifetime
}); });
this.captchas.sort(function(a, b) {
return a.timeout - b.timeout;
});
$.set('captchas', this.captchas); $.set('captchas', this.captchas);
this.count(); this.count();
focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src); focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && /https?:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src);
if (this.needed()) { if (this.needed()) {
if (focus) { if (focus) {
if (QR.cooldown.auto || Conf['Post on Captcha Completion']) { if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
this.shouldFocus = true; this.nodes.counter.focus();
} else { } else {
QR.nodes.status.focus(); QR.nodes.status.focus();
} }
@ -8760,7 +8766,7 @@
this.captchas = this.captchas.slice(i); this.captchas = this.captchas.slice(i);
this.count(); this.count();
$.set('captchas', this.captchas); $.set('captchas', this.captchas);
return this.setup(d.activeElement === QR.nodes.status); return this.setup(true);
}, },
count: function() { count: function() {
this.nodes.counter.textContent = "Captchas: " + this.captchas.length; this.nodes.counter.textContent = "Captchas: " + this.captchas.length;

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.17.2' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.17.3' />
</app> </app>
</gupdate> </gupdate>

2
builds/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.17.2' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.17.3' />
</app> </app>
</gupdate> </gupdate>

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.11.17.2", "version": "1.11.17.3",
"date": "2015-11-16T07:50:49.812Z" "date": "2015-11-18T06:28:00.317Z"
} }