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

Release 4chan X v1.7.23.

Browse Source
This commit is contained in:
ccd0 2014-04-29 04:52:38 -07:00
parent 4fe98beb41
commit d5035005fd
9 changed files with 175 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
### v1.7.23
*2014-04-29*
**ccd0** **ccd0**
- Partly restore Mayhem's captcha changes reverted in last version. Captchas are now destroyed after posting instead of reloaded, unless `Auto-load captcha` is checked. Captcha caching is still enabled. - Partly restore Mayhem's captcha changes reverted in last version. Captchas are now destroyed after posting instead of reloaded, unless `Auto-load captcha` is checked. Captcha caching is still enabled.
- Update for changes in Recaptcha, in particular `Recaptcha.reload("t")` no longer working. - Update for changes in Recaptcha, in particular `Recaptcha.reload("t")` no longer working.

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.7.22 - 2014-04-27 * 4chan X - Version 1.7.23 - 2014-04-29
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE

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

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

128
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.7.22 // @version 1.7.23
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -24,7 +24,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.7.22 - 2014-04-27 * 4chan X - Version 1.7.23 - 2014-04-29
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -224,7 +224,7 @@
'Cooldown Prediction': [true, 'Decrease the cooldown time by taking into account upload speed. Disable it if it\'s inaccurate for you.'], 'Cooldown Prediction': [true, 'Decrease the cooldown time by taking into account upload speed. Disable it if it\'s inaccurate for you.'],
'Posting Success Notifications': [true, 'Show notifications on successful post creation or file uploading.'], 'Posting Success Notifications': [true, 'Show notifications on successful post creation or file uploading.'],
'Captcha Warning Notifications': [true, 'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'], 'Captcha Warning Notifications': [true, 'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'],
'Auto-load captcha': [false, 'Automatically load the captcha when you open a thread'] 'Auto-load captcha': [false, 'Automatically load the captcha when you open a thread, and reload it after you post.']
}, },
'Quote Links': { 'Quote Links': {
'Quote Backlinks': [true, 'Add quote backlinks.'], 'Quote Backlinks': [true, 'Add quote backlinks.'],
@ -372,7 +372,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.7.22', VERSION: '1.7.23',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -5807,7 +5807,10 @@
post["delete"](); post["delete"]();
} }
QR.cooldown.auto = false; QR.cooldown.auto = false;
return QR.status(); QR.status();
if (QR.captcha.isEnabled && !Conf['Auto-load captcha']) {
return QR.captcha.destroy();
}
}, },
focusin: function() { focusin: function() {
return $.addClass(QR.nodes.el, 'focus'); return $.addClass(QR.nodes.el, 'focus');
@ -5841,8 +5844,10 @@
el.removeAttribute('style'); el.removeAttribute('style');
} }
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(); if (QR.captcha.captchas.length === 0) {
QR.captcha.setup(); 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 {
@ -6517,7 +6522,7 @@
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) { if (QR.posts.length > 1 && QR.captcha.isEnabled && QR.captcha.captchas.length === 0) {
QR.captcha.setup(); QR.captcha.setup();
} }
post.rm(); post.rm();
@ -6552,12 +6557,11 @@
QR.captcha = { QR.captcha = {
init: function() { init: function() {
var container, imgContainer, input; var imgContainer, input;
if (d.cookie.indexOf('pass_enabled=1') >= 0) { if (d.cookie.indexOf('pass_enabled=1') >= 0) {
return; return;
} }
container = $.id('captchaContainer'); if (!(this.isEnabled = !!$.id('captchaContainer'))) {
if (!(this.isEnabled = !!container)) {
return; return;
} }
if (Conf['Auto-load captcha']) { if (Conf['Auto-load captcha']) {
@ -6566,13 +6570,11 @@
imgContainer = $.el('div', { imgContainer = $.el('div', {
className: 'captcha-img', className: 'captcha-img',
title: 'Reload reCAPTCHA', title: 'Reload reCAPTCHA',
innerHTML: '<img>', innerHTML: '<img>'
hidden: true
}); });
input = $.el('input', { input = $.el('input', {
className: 'captcha-input field', className: 'captcha-input field',
title: 'Verification', title: 'Verification',
placeholder: 'Focus to load reCAPTCHA',
autocomplete: 'off', autocomplete: 'off',
spellcheck: false, spellcheck: false,
tabIndex: 45 tabIndex: 45
@ -6581,16 +6583,35 @@
img: imgContainer.firstChild, img: imgContainer.firstChild,
input: input input: input
}; };
$.on(input, 'focus', this.setup);
$.on(input, 'blur', QR.focusout); $.on(input, 'blur', QR.focusout);
$.on(input, 'focus', QR.focusin); $.on(input, 'focus', QR.focusin);
$.on(input, 'keydown', QR.captcha.keydown.bind(QR.captcha));
$.on(this.nodes.img.parentNode, 'click', QR.captcha.reload.bind(QR.captcha));
$.addClass(QR.nodes.el, 'has-captcha'); $.addClass(QR.nodes.el, 'has-captcha');
$.after(QR.nodes.com.parentNode, [imgContainer, input]); $.after(QR.nodes.com.parentNode, [imgContainer, input]);
this.captchas = [];
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
QR.captcha.sync(captchas);
return QR.captcha.clear();
});
$.sync('captchas', this.sync);
this.beforeSetup();
return this.afterSetup();
},
beforeSetup: function() {
var img, input, _ref;
_ref = this.nodes, img = _ref.img, input = _ref.input;
img.parentNode.hidden = true;
input.value = '';
input.placeholder = 'Focus to load reCAPTCHA';
this.count();
$.on(input, 'focus', this.setup);
this.setupObserver = new MutationObserver(this.afterSetup); this.setupObserver = new MutationObserver(this.afterSetup);
this.setupObserver.observe(container, { return this.setupObserver.observe($.id('captchaContainer'), {
childList: true childList: true
}); });
return this.afterSetup();
}, },
setup: function() { setup: function() {
return $.globalEval('loadRecaptcha()'); return $.globalEval('loadRecaptcha()');
@ -6610,15 +6631,9 @@
$.off(window, 'captcha:timeout', setLifetime); $.off(window, 'captcha:timeout', setLifetime);
_ref = QR.captcha.nodes, img = _ref.img, input = _ref.input; _ref = QR.captcha.nodes, img = _ref.img, input = _ref.input;
img.parentNode.hidden = false; img.parentNode.hidden = false;
input.placeholder = 'Verification';
QR.captcha.count();
$.off(input, 'focus', QR.captcha.setup); $.off(input, 'focus', QR.captcha.setup);
$.on(input, 'keydown', QR.captcha.keydown.bind(QR.captcha));
$.on(img.parentNode, 'click', QR.captcha.reload.bind(QR.captcha));
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return QR.captcha.sync(captchas);
});
$.sync('captchas', QR.captcha.sync);
QR.captcha.nodes.challenge = challenge; QR.captcha.nodes.challenge = challenge;
new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, { new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, {
childList: true, childList: true,
@ -6627,6 +6642,10 @@
}); });
return QR.captcha.load(); return QR.captcha.load();
}, },
destroy: function() {
$.globalEval('Recaptcha.destroy()');
return this.beforeSetup();
},
sync: function(captchas) { sync: function(captchas) {
QR.captcha.captchas = captchas; QR.captcha.captchas = captchas;
return QR.captcha.count(); return QR.captcha.count();
@ -6641,7 +6660,11 @@
} else { } else {
challenge = this.nodes.img.alt; challenge = this.nodes.img.alt;
if (response = this.nodes.input.value) { if (response = this.nodes.input.value) {
this.reload(); if (Conf['Auto-load captcha']) {
this.reload();
} else {
this.destroy();
}
} }
} }
if (response) { if (response) {
@ -6660,6 +6683,7 @@
if (!(response = this.nodes.input.value.trim())) { if (!(response = this.nodes.input.value.trim())) {
return; return;
} }
this.nodes.input.value = '';
this.captchas.push({ this.captchas.push({
challenge: this.nodes.img.alt, challenge: this.nodes.img.alt,
response: response, response: response,
@ -6690,34 +6714,44 @@
return $.set('captchas', this.captchas); return $.set('captchas', this.captchas);
}, },
load: function() { load: function() {
var challenge; var challenge, challenge_image;
if (!this.nodes.challenge.firstChild) { if (!this.nodes.challenge.firstChild) {
return; return;
} }
if (!(challenge_image = $.id('recaptcha_challenge_image'))) {
return;
}
this.timeout = Date.now() + this.lifetime * $.SECOND - $.MINUTE; this.timeout = Date.now() + this.lifetime * $.SECOND - $.MINUTE;
challenge = this.nodes.challenge.firstChild.value; challenge = this.nodes.challenge.firstChild.value;
this.nodes.img.alt = challenge; this.nodes.img.alt = challenge;
this.nodes.img.src = "//www.google.com/recaptcha/api/image?c=" + challenge; this.nodes.img.src = challenge_image.src;
this.nodes.input.value = null; this.nodes.input.value = null;
return this.clear(); return this.clear();
}, },
count: function() { count: function() {
var count; var count, placeholder;
count = this.captchas ? this.captchas.length : 0; count = this.captchas ? this.captchas.length : 0;
this.nodes.input.placeholder = (function() { placeholder = this.nodes.input.placeholder.replace(/\ \(.*\)$/, '');
placeholder += (function() {
switch (count) { switch (count) {
case 0: case 0:
return 'Verification (Shift + Enter to cache)'; if (placeholder === 'Verification') {
return ' (Shift + Enter to cache)';
} else {
return '';
}
break;
case 1: case 1:
return 'Verification (1 cached captcha)'; return ' (1 cached captcha)';
default: default:
return "Verification (" + count + " cached captchas)"; return " (" + count + " cached captchas)";
} }
})(); })();
this.nodes.input.placeholder = placeholder;
return this.nodes.input.alt = count; return this.nodes.input.alt = count;
}, },
reload: function(focus) { reload: function(focus) {
$.globalEval('Recaptcha.reload("t")'); $.globalEval('Recaptcha.reload(); Recaptcha.should_focus = false;');
if (focus) { if (focus) {
return this.nodes.input.focus(); return this.nodes.input.focus();
} }
@ -7166,7 +7200,7 @@
if (this === QR.selected) { if (this === QR.selected) {
this.showFileData(); this.showFileData();
} }
if (!/^image/.test(file.type)) { if (!/^(image|video)\//.test(file.type)) {
this.nodes.el.style.backgroundImage = null; this.nodes.el.style.backgroundImage = null;
return; return;
} }
@ -7174,20 +7208,26 @@
}; };
_Class.prototype.setThumbnail = function() { _Class.prototype.setThumbnail = function() {
var fileURL, img; var fileURL, img, isVideo;
img = $.el('img'); isVideo = /^video\//.test(this.file.type);
img.onload = (function(_this) { img = $.el((isVideo ? 'video' : 'img'));
$.on(img, (isVideo ? 'loadeddata' : 'load'), (function(_this) {
return function() { return function() {
var cv, height, s, width; var cv, height, s, width;
s = 90 * 2 * window.devicePixelRatio; s = 90 * 2 * window.devicePixelRatio;
if (_this.file.type === 'image/gif') { if (_this.file.type === 'image/gif') {
s *= 3; s *= 3;
} }
height = img.height, width = img.width; if (isVideo) {
if (height < s || width < s) { height = img.videoHeight;
_this.URL = fileURL; width = img.videoWidth;
_this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")"; } else {
return; height = img.height, width = img.width;
if (height < s || width < s) {
_this.URL = fileURL;
_this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")";
return;
}
} }
if (height <= width) { if (height <= width) {
width = s / height * width; width = s / height * width;
@ -7206,7 +7246,7 @@
return _this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")"; return _this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")";
}); });
}; };
})(this); })(this));
fileURL = URL.createObjectURL(this.file); fileURL = URL.createObjectURL(this.file);
return img.src = fileURL; return img.src = fileURL;
}; };

BIN
builds/crx.crx
View File

Binary file not shown.

2
builds/crx/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan X", "name": "4chan X",
"version": "1.7.22", "version": "1.7.23",
"manifest_version": 2, "manifest_version": 2,
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"icons": { "icons": {

126
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* 4chan X - Version 1.7.22 - 2014-04-27 * 4chan X - Version 1.7.23 - 2014-04-29
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -200,7 +200,7 @@
'Cooldown Prediction': [true, 'Decrease the cooldown time by taking into account upload speed. Disable it if it\'s inaccurate for you.'], 'Cooldown Prediction': [true, 'Decrease the cooldown time by taking into account upload speed. Disable it if it\'s inaccurate for you.'],
'Posting Success Notifications': [true, 'Show notifications on successful post creation or file uploading.'], 'Posting Success Notifications': [true, 'Show notifications on successful post creation or file uploading.'],
'Captcha Warning Notifications': [true, 'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'], 'Captcha Warning Notifications': [true, 'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'],
'Auto-load captcha': [false, 'Automatically load the captcha when you open a thread'] 'Auto-load captcha': [false, 'Automatically load the captcha when you open a thread, and reload it after you post.']
}, },
'Quote Links': { 'Quote Links': {
'Quote Backlinks': [true, 'Add quote backlinks.'], 'Quote Backlinks': [true, 'Add quote backlinks.'],
@ -348,7 +348,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.7.22', VERSION: '1.7.23',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -5842,7 +5842,10 @@
post["delete"](); post["delete"]();
} }
QR.cooldown.auto = false; QR.cooldown.auto = false;
return QR.status(); QR.status();
if (QR.captcha.isEnabled && !Conf['Auto-load captcha']) {
return QR.captcha.destroy();
}
}, },
focusin: function() { focusin: function() {
return $.addClass(QR.nodes.el, 'focus'); return $.addClass(QR.nodes.el, 'focus');
@ -5876,8 +5879,10 @@
el.removeAttribute('style'); el.removeAttribute('style');
} }
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(); if (QR.captcha.captchas.length === 0) {
QR.captcha.setup(); 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 {
@ -6542,7 +6547,7 @@
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) { if (QR.posts.length > 1 && QR.captcha.isEnabled && QR.captcha.captchas.length === 0) {
QR.captcha.setup(); QR.captcha.setup();
} }
post.rm(); post.rm();
@ -6577,12 +6582,11 @@
QR.captcha = { QR.captcha = {
init: function() { init: function() {
var container, imgContainer, input; var imgContainer, input;
if (d.cookie.indexOf('pass_enabled=1') >= 0) { if (d.cookie.indexOf('pass_enabled=1') >= 0) {
return; return;
} }
container = $.id('captchaContainer'); if (!(this.isEnabled = !!$.id('captchaContainer'))) {
if (!(this.isEnabled = !!container)) {
return; return;
} }
if (Conf['Auto-load captcha']) { if (Conf['Auto-load captcha']) {
@ -6591,13 +6595,11 @@
imgContainer = $.el('div', { imgContainer = $.el('div', {
className: 'captcha-img', className: 'captcha-img',
title: 'Reload reCAPTCHA', title: 'Reload reCAPTCHA',
innerHTML: '<img>', innerHTML: '<img>'
hidden: true
}); });
input = $.el('input', { input = $.el('input', {
className: 'captcha-input field', className: 'captcha-input field',
title: 'Verification', title: 'Verification',
placeholder: 'Focus to load reCAPTCHA',
autocomplete: 'off', autocomplete: 'off',
spellcheck: false, spellcheck: false,
tabIndex: 45 tabIndex: 45
@ -6606,16 +6608,35 @@
img: imgContainer.firstChild, img: imgContainer.firstChild,
input: input input: input
}; };
$.on(input, 'focus', this.setup);
$.on(input, 'blur', QR.focusout); $.on(input, 'blur', QR.focusout);
$.on(input, 'focus', QR.focusin); $.on(input, 'focus', QR.focusin);
$.on(input, 'keydown', QR.captcha.keydown.bind(QR.captcha));
$.on(this.nodes.img.parentNode, 'click', QR.captcha.reload.bind(QR.captcha));
$.addClass(QR.nodes.el, 'has-captcha'); $.addClass(QR.nodes.el, 'has-captcha');
$.after(QR.nodes.com.parentNode, [imgContainer, input]); $.after(QR.nodes.com.parentNode, [imgContainer, input]);
this.captchas = [];
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
QR.captcha.sync(captchas);
return QR.captcha.clear();
});
$.sync('captchas', this.sync);
this.beforeSetup();
return this.afterSetup();
},
beforeSetup: function() {
var img, input, _ref;
_ref = this.nodes, img = _ref.img, input = _ref.input;
img.parentNode.hidden = true;
input.value = '';
input.placeholder = 'Focus to load reCAPTCHA';
this.count();
$.on(input, 'focus', this.setup);
this.setupObserver = new MutationObserver(this.afterSetup); this.setupObserver = new MutationObserver(this.afterSetup);
this.setupObserver.observe(container, { return this.setupObserver.observe($.id('captchaContainer'), {
childList: true childList: true
}); });
return this.afterSetup();
}, },
setup: function() { setup: function() {
return $.globalEval('loadRecaptcha()'); return $.globalEval('loadRecaptcha()');
@ -6635,15 +6656,9 @@
$.off(window, 'captcha:timeout', setLifetime); $.off(window, 'captcha:timeout', setLifetime);
_ref = QR.captcha.nodes, img = _ref.img, input = _ref.input; _ref = QR.captcha.nodes, img = _ref.img, input = _ref.input;
img.parentNode.hidden = false; img.parentNode.hidden = false;
input.placeholder = 'Verification';
QR.captcha.count();
$.off(input, 'focus', QR.captcha.setup); $.off(input, 'focus', QR.captcha.setup);
$.on(input, 'keydown', QR.captcha.keydown.bind(QR.captcha));
$.on(img.parentNode, 'click', QR.captcha.reload.bind(QR.captcha));
$.get('captchas', [], function(_arg) {
var captchas;
captchas = _arg.captchas;
return QR.captcha.sync(captchas);
});
$.sync('captchas', QR.captcha.sync);
QR.captcha.nodes.challenge = challenge; QR.captcha.nodes.challenge = challenge;
new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, { new MutationObserver(QR.captcha.load.bind(QR.captcha)).observe(challenge, {
childList: true, childList: true,
@ -6652,6 +6667,10 @@
}); });
return QR.captcha.load(); return QR.captcha.load();
}, },
destroy: function() {
$.globalEval('Recaptcha.destroy()');
return this.beforeSetup();
},
sync: function(captchas) { sync: function(captchas) {
QR.captcha.captchas = captchas; QR.captcha.captchas = captchas;
return QR.captcha.count(); return QR.captcha.count();
@ -6666,7 +6685,11 @@
} else { } else {
challenge = this.nodes.img.alt; challenge = this.nodes.img.alt;
if (response = this.nodes.input.value) { if (response = this.nodes.input.value) {
this.reload(); if (Conf['Auto-load captcha']) {
this.reload();
} else {
this.destroy();
}
} }
} }
if (response) { if (response) {
@ -6685,6 +6708,7 @@
if (!(response = this.nodes.input.value.trim())) { if (!(response = this.nodes.input.value.trim())) {
return; return;
} }
this.nodes.input.value = '';
this.captchas.push({ this.captchas.push({
challenge: this.nodes.img.alt, challenge: this.nodes.img.alt,
response: response, response: response,
@ -6715,34 +6739,44 @@
return $.set('captchas', this.captchas); return $.set('captchas', this.captchas);
}, },
load: function() { load: function() {
var challenge; var challenge, challenge_image;
if (!this.nodes.challenge.firstChild) { if (!this.nodes.challenge.firstChild) {
return; return;
} }
if (!(challenge_image = $.id('recaptcha_challenge_image'))) {
return;
}
this.timeout = Date.now() + this.lifetime * $.SECOND - $.MINUTE; this.timeout = Date.now() + this.lifetime * $.SECOND - $.MINUTE;
challenge = this.nodes.challenge.firstChild.value; challenge = this.nodes.challenge.firstChild.value;
this.nodes.img.alt = challenge; this.nodes.img.alt = challenge;
this.nodes.img.src = "//www.google.com/recaptcha/api/image?c=" + challenge; this.nodes.img.src = challenge_image.src;
this.nodes.input.value = null; this.nodes.input.value = null;
return this.clear(); return this.clear();
}, },
count: function() { count: function() {
var count; var count, placeholder;
count = this.captchas ? this.captchas.length : 0; count = this.captchas ? this.captchas.length : 0;
this.nodes.input.placeholder = (function() { placeholder = this.nodes.input.placeholder.replace(/\ \(.*\)$/, '');
placeholder += (function() {
switch (count) { switch (count) {
case 0: case 0:
return 'Verification (Shift + Enter to cache)'; if (placeholder === 'Verification') {
return ' (Shift + Enter to cache)';
} else {
return '';
}
break;
case 1: case 1:
return 'Verification (1 cached captcha)'; return ' (1 cached captcha)';
default: default:
return "Verification (" + count + " cached captchas)"; return " (" + count + " cached captchas)";
} }
})(); })();
this.nodes.input.placeholder = placeholder;
return this.nodes.input.alt = count; return this.nodes.input.alt = count;
}, },
reload: function(focus) { reload: function(focus) {
$.globalEval('Recaptcha.reload("t")'); $.globalEval('Recaptcha.reload(); Recaptcha.should_focus = false;');
if (focus) { if (focus) {
return this.nodes.input.focus(); return this.nodes.input.focus();
} }
@ -7185,7 +7219,7 @@
if (this === QR.selected) { if (this === QR.selected) {
this.showFileData(); this.showFileData();
} }
if (!/^image/.test(file.type)) { if (!/^(image|video)\//.test(file.type)) {
this.nodes.el.style.backgroundImage = null; this.nodes.el.style.backgroundImage = null;
return; return;
} }
@ -7193,20 +7227,26 @@
}; };
_Class.prototype.setThumbnail = function() { _Class.prototype.setThumbnail = function() {
var fileURL, img; var fileURL, img, isVideo;
img = $.el('img'); isVideo = /^video\//.test(this.file.type);
img.onload = (function(_this) { img = $.el((isVideo ? 'video' : 'img'));
$.on(img, (isVideo ? 'loadeddata' : 'load'), (function(_this) {
return function() { return function() {
var cv, height, s, width; var cv, height, s, width;
s = 90 * 2 * window.devicePixelRatio; s = 90 * 2 * window.devicePixelRatio;
if (_this.file.type === 'image/gif') { if (_this.file.type === 'image/gif') {
s *= 3; s *= 3;
} }
height = img.height, width = img.width; if (isVideo) {
if (height < s || width < s) { height = img.videoHeight;
_this.URL = fileURL; width = img.videoWidth;
_this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")"; } else {
return; height = img.height, width = img.width;
if (height < s || width < s) {
_this.URL = fileURL;
_this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")";
return;
}
} }
if (height <= width) { if (height <= width) {
width = s / height * width; width = s / height * width;
@ -7225,7 +7265,7 @@
return _this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")"; return _this.nodes.el.style.backgroundImage = "url(" + _this.URL + ")";
}); });
}; };
})(this); })(this));
fileURL = URL.createObjectURL(this.file); fileURL = URL.createObjectURL(this.file);
return img.src = fileURL; return img.src = fileURL;
}; };

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://ccd0.github.io/4chan-x/builds/crx.crx' version='1.7.22' /> <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/crx.crx' version='1.7.23' />
</app> </app>
</gupdate> </gupdate>

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan-X", "name": "4chan-X",
"version": "1.7.22", "version": "1.7.23",
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": { "meta": {
"name": "4chan X", "name": "4chan X",