Release 4chan X v1.11.22.2.
This commit is contained in:
parent
dded519aa1
commit
eec61b3ba7
@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
|
|||||||
|
|
||||||
### v1.11.22
|
### v1.11.22
|
||||||
|
|
||||||
|
**v1.11.22.2** *(2016-01-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.2/builds/4chan-X-noupdate.crx "Chromium version")]
|
||||||
|
- Update due to 4chan changing to Recaptcha v2 on report form.
|
||||||
|
|
||||||
**v1.11.22.1** *(2016-01-12)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.1/builds/4chan-X-noupdate.crx "Chromium version")]
|
**v1.11.22.1** *(2016-01-12)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.1/builds/4chan-X-noupdate.crx "Chromium version")]
|
||||||
- Update archive image search URL, avoiding problem with image search on fireden.net.
|
- Update archive image search URL, avoiding problem with image search on fireden.net.
|
||||||
- Add `%sMD5` (MD5 in URL-safe base64) and `%hMD5` (MD5 in hexadecimal) to available sauce parameters.
|
- Add `%sMD5` (MD5 in URL-safe base64) and `%hMD5` (MD5 in hexadecimal) to available sauce parameters.
|
||||||
|
|||||||
Binary file not shown.
@ -1,6 +1,6 @@
|
|||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name 4chan X beta
|
// @name 4chan X beta
|
||||||
// @version 1.11.22.1
|
// @version 1.11.22.2
|
||||||
// @minGMVer 1.14
|
// @minGMVer 1.14
|
||||||
// @minFFVer 26
|
// @minFFVer 26
|
||||||
// @namespace 4chan-X
|
// @namespace 4chan-X
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// Generated by CoffeeScript
|
// Generated by CoffeeScript
|
||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name 4chan X beta
|
// @name 4chan X beta
|
||||||
// @version 1.11.22.1
|
// @version 1.11.22.2
|
||||||
// @minGMVer 1.14
|
// @minGMVer 1.14
|
||||||
// @minFFVer 26
|
// @minFFVer 26
|
||||||
// @namespace 4chan-X
|
// @namespace 4chan-X
|
||||||
@ -245,8 +245,8 @@
|
|||||||
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
|
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
|
||||||
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
|
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
|
||||||
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
|
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
|
||||||
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
|
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha in the post form.'],
|
||||||
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
|
'Use Recaptcha v1 in Reports': [false, 'Use the text captcha in the report window.'],
|
||||||
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
|
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
|
||||||
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
|
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
|
||||||
},
|
},
|
||||||
@ -434,7 +434,7 @@
|
|||||||
doc = d.documentElement;
|
doc = d.documentElement;
|
||||||
|
|
||||||
g = {
|
g = {
|
||||||
VERSION: '1.11.22.1',
|
VERSION: '1.11.22.2',
|
||||||
NAMESPACE: '4chan X.',
|
NAMESPACE: '4chan X.',
|
||||||
boards: {}
|
boards: {}
|
||||||
};
|
};
|
||||||
@ -8158,18 +8158,10 @@
|
|||||||
|
|
||||||
Captcha.replace = {
|
Captcha.replace = {
|
||||||
init: function() {
|
init: function() {
|
||||||
var type;
|
|
||||||
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
|
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
|
if (((Conf['Use Recaptcha v1'] && location.hostname === 'boards.4chan.org') || (Conf['Use Recaptcha v1 in Reports'] && location.hostname === 'sys.4chan.org')) && Main.jsEnabled) {
|
||||||
if (Conf['Use Recaptcha v2 in Reports']) {
|
|
||||||
type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
|
|
||||||
$.ready(Captcha.replace[type]);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
|
|
||||||
$.ready(Captcha.replace.v1);
|
$.ready(Captcha.replace.v1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -8226,29 +8218,6 @@
|
|||||||
return Captcha.v1.create();
|
return Captcha.v1.create();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
v2: function() {
|
|
||||||
var container, lang, old, script, url;
|
|
||||||
if (!(old = $.id('captchaContainerAlt'))) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
container = $.el('div', {
|
|
||||||
className: 'g-recaptcha'
|
|
||||||
});
|
|
||||||
$.extend(container.dataset, {
|
|
||||||
sitekey: '6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc',
|
|
||||||
tabindex: 3
|
|
||||||
});
|
|
||||||
$.replace(old, container);
|
|
||||||
url = 'https://www.google.com/recaptcha/api.js';
|
|
||||||
if ((lang = Conf['captchaLanguage'].trim())) {
|
|
||||||
url += "?hl=" + (encodeURIComponent(lang));
|
|
||||||
}
|
|
||||||
script = $.el('script', {
|
|
||||||
src: url
|
|
||||||
});
|
|
||||||
$.add(d.head, script);
|
|
||||||
return $.onExists(d.body, 'iframe', Captcha.replace.autocopy);
|
|
||||||
},
|
|
||||||
iframe: function(iframe) {
|
iframe: function(iframe) {
|
||||||
var lang, src;
|
var lang, src;
|
||||||
if ((lang = Conf['captchaLanguage'].trim())) {
|
if ((lang = Conf['captchaLanguage'].trim())) {
|
||||||
@ -12880,14 +12849,14 @@
|
|||||||
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
|
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
|
||||||
a.textContent = 'Report';
|
a.textContent = 'Report';
|
||||||
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
|
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
|
||||||
ReportLink.height = 180;
|
ReportLink.dims = 'width=400,height=550';
|
||||||
} else if (Conf['Archive Report']) {
|
} else if (Conf['Archive Report']) {
|
||||||
a.textContent = 'Report to archive';
|
a.textContent = 'Report to archive';
|
||||||
ReportLink.url = Redirect.to('report', {
|
ReportLink.url = Redirect.to('report', {
|
||||||
boardID: post.board.ID,
|
boardID: post.board.ID,
|
||||||
postID: post.ID
|
postID: post.ID
|
||||||
});
|
});
|
||||||
ReportLink.height = 350;
|
ReportLink.dims = 'width=700,height=475';
|
||||||
} else {
|
} else {
|
||||||
ReportLink.url = '';
|
ReportLink.url = '';
|
||||||
}
|
}
|
||||||
@ -12896,10 +12865,10 @@
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
report: function() {
|
report: function() {
|
||||||
var height, id, set, url;
|
var dims, id, set, url;
|
||||||
url = ReportLink.url, height = ReportLink.height;
|
url = ReportLink.url, dims = ReportLink.dims;
|
||||||
id = Date.now();
|
id = Date.now();
|
||||||
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
|
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1," + dims;
|
||||||
return window.open(url, id, set);
|
return window.open(url, id, set);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -16647,7 +16616,7 @@
|
|||||||
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
|
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
|
||||||
if (location.hash === '#redirect') {
|
if (location.hash === '#redirect') {
|
||||||
$.globalEval('self.close = function(){};');
|
$.globalEval('self.close = function(){};');
|
||||||
window.resizeBy(0, 350 - doc.clientHeight);
|
window.resizeTo(700, 475);
|
||||||
location.replace(url);
|
location.replace(url);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -16658,7 +16627,7 @@
|
|||||||
});
|
});
|
||||||
$.on(link, 'click', function(e) {
|
$.on(link, 'click', function(e) {
|
||||||
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
|
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
|
||||||
return window.resizeBy(0, 350 - doc.clientHeight);
|
return window.resizeTo(700, 475);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
|
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
|
||||||
@ -17310,6 +17279,11 @@
|
|||||||
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
|
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (compareString < '00001.00011.00022.00002') {
|
||||||
|
if ((data['Use Recaptcha v1 in Reports'] == null) && data['Use Recaptcha v1'] && !data['Use Recaptcha v2 in Reports']) {
|
||||||
|
set('Use Recaptcha v1 in Reports', true);
|
||||||
|
}
|
||||||
|
}
|
||||||
return changes;
|
return changes;
|
||||||
},
|
},
|
||||||
loadSettings: function(data, cb) {
|
loadSettings: function(data, cb) {
|
||||||
|
|||||||
Binary file not shown.
@ -1,7 +1,7 @@
|
|||||||
// Generated by CoffeeScript
|
// Generated by CoffeeScript
|
||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name 4chan X
|
// @name 4chan X
|
||||||
// @version 1.11.22.1
|
// @version 1.11.22.2
|
||||||
// @minGMVer 1.14
|
// @minGMVer 1.14
|
||||||
// @minFFVer 26
|
// @minFFVer 26
|
||||||
// @namespace 4chan-X
|
// @namespace 4chan-X
|
||||||
@ -245,8 +245,8 @@
|
|||||||
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
|
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
|
||||||
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
|
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
|
||||||
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
|
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
|
||||||
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
|
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha in the post form.'],
|
||||||
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
|
'Use Recaptcha v1 in Reports': [false, 'Use the text captcha in the report window.'],
|
||||||
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
|
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
|
||||||
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
|
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
|
||||||
},
|
},
|
||||||
@ -434,7 +434,7 @@
|
|||||||
doc = d.documentElement;
|
doc = d.documentElement;
|
||||||
|
|
||||||
g = {
|
g = {
|
||||||
VERSION: '1.11.22.1',
|
VERSION: '1.11.22.2',
|
||||||
NAMESPACE: '4chan X.',
|
NAMESPACE: '4chan X.',
|
||||||
boards: {}
|
boards: {}
|
||||||
};
|
};
|
||||||
@ -8158,18 +8158,10 @@
|
|||||||
|
|
||||||
Captcha.replace = {
|
Captcha.replace = {
|
||||||
init: function() {
|
init: function() {
|
||||||
var type;
|
|
||||||
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
|
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
|
if (((Conf['Use Recaptcha v1'] && location.hostname === 'boards.4chan.org') || (Conf['Use Recaptcha v1 in Reports'] && location.hostname === 'sys.4chan.org')) && Main.jsEnabled) {
|
||||||
if (Conf['Use Recaptcha v2 in Reports']) {
|
|
||||||
type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
|
|
||||||
$.ready(Captcha.replace[type]);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
|
|
||||||
$.ready(Captcha.replace.v1);
|
$.ready(Captcha.replace.v1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -8226,29 +8218,6 @@
|
|||||||
return Captcha.v1.create();
|
return Captcha.v1.create();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
v2: function() {
|
|
||||||
var container, lang, old, script, url;
|
|
||||||
if (!(old = $.id('captchaContainerAlt'))) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
container = $.el('div', {
|
|
||||||
className: 'g-recaptcha'
|
|
||||||
});
|
|
||||||
$.extend(container.dataset, {
|
|
||||||
sitekey: '6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc',
|
|
||||||
tabindex: 3
|
|
||||||
});
|
|
||||||
$.replace(old, container);
|
|
||||||
url = 'https://www.google.com/recaptcha/api.js';
|
|
||||||
if ((lang = Conf['captchaLanguage'].trim())) {
|
|
||||||
url += "?hl=" + (encodeURIComponent(lang));
|
|
||||||
}
|
|
||||||
script = $.el('script', {
|
|
||||||
src: url
|
|
||||||
});
|
|
||||||
$.add(d.head, script);
|
|
||||||
return $.onExists(d.body, 'iframe', Captcha.replace.autocopy);
|
|
||||||
},
|
|
||||||
iframe: function(iframe) {
|
iframe: function(iframe) {
|
||||||
var lang, src;
|
var lang, src;
|
||||||
if ((lang = Conf['captchaLanguage'].trim())) {
|
if ((lang = Conf['captchaLanguage'].trim())) {
|
||||||
@ -12880,14 +12849,14 @@
|
|||||||
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
|
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
|
||||||
a.textContent = 'Report';
|
a.textContent = 'Report';
|
||||||
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
|
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
|
||||||
ReportLink.height = 180;
|
ReportLink.dims = 'width=400,height=550';
|
||||||
} else if (Conf['Archive Report']) {
|
} else if (Conf['Archive Report']) {
|
||||||
a.textContent = 'Report to archive';
|
a.textContent = 'Report to archive';
|
||||||
ReportLink.url = Redirect.to('report', {
|
ReportLink.url = Redirect.to('report', {
|
||||||
boardID: post.board.ID,
|
boardID: post.board.ID,
|
||||||
postID: post.ID
|
postID: post.ID
|
||||||
});
|
});
|
||||||
ReportLink.height = 350;
|
ReportLink.dims = 'width=700,height=475';
|
||||||
} else {
|
} else {
|
||||||
ReportLink.url = '';
|
ReportLink.url = '';
|
||||||
}
|
}
|
||||||
@ -12896,10 +12865,10 @@
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
report: function() {
|
report: function() {
|
||||||
var height, id, set, url;
|
var dims, id, set, url;
|
||||||
url = ReportLink.url, height = ReportLink.height;
|
url = ReportLink.url, dims = ReportLink.dims;
|
||||||
id = Date.now();
|
id = Date.now();
|
||||||
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
|
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1," + dims;
|
||||||
return window.open(url, id, set);
|
return window.open(url, id, set);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -16647,7 +16616,7 @@
|
|||||||
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
|
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
|
||||||
if (location.hash === '#redirect') {
|
if (location.hash === '#redirect') {
|
||||||
$.globalEval('self.close = function(){};');
|
$.globalEval('self.close = function(){};');
|
||||||
window.resizeBy(0, 350 - doc.clientHeight);
|
window.resizeTo(700, 475);
|
||||||
location.replace(url);
|
location.replace(url);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -16658,7 +16627,7 @@
|
|||||||
});
|
});
|
||||||
$.on(link, 'click', function(e) {
|
$.on(link, 'click', function(e) {
|
||||||
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
|
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
|
||||||
return window.resizeBy(0, 350 - doc.clientHeight);
|
return window.resizeTo(700, 475);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
|
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
|
||||||
@ -17310,6 +17279,11 @@
|
|||||||
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
|
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (compareString < '00001.00011.00022.00002') {
|
||||||
|
if ((data['Use Recaptcha v1 in Reports'] == null) && data['Use Recaptcha v1'] && !data['Use Recaptcha v2 in Reports']) {
|
||||||
|
set('Use Recaptcha v1 in Reports', true);
|
||||||
|
}
|
||||||
|
}
|
||||||
return changes;
|
return changes;
|
||||||
},
|
},
|
||||||
loadSettings: function(data, cb) {
|
loadSettings: function(data, cb) {
|
||||||
|
|||||||
Binary file not shown.
@ -1,6 +1,6 @@
|
|||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name 4chan X
|
// @name 4chan X
|
||||||
// @version 1.11.22.1
|
// @version 1.11.22.2
|
||||||
// @minGMVer 1.14
|
// @minGMVer 1.14
|
||||||
// @minFFVer 26
|
// @minFFVer 26
|
||||||
// @namespace 4chan-X
|
// @namespace 4chan-X
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// Generated by CoffeeScript
|
// Generated by CoffeeScript
|
||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name 4chan X
|
// @name 4chan X
|
||||||
// @version 1.11.22.1
|
// @version 1.11.22.2
|
||||||
// @minGMVer 1.14
|
// @minGMVer 1.14
|
||||||
// @minFFVer 26
|
// @minFFVer 26
|
||||||
// @namespace 4chan-X
|
// @namespace 4chan-X
|
||||||
@ -245,8 +245,8 @@
|
|||||||
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
|
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
|
||||||
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
|
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
|
||||||
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
|
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
|
||||||
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
|
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha in the post form.'],
|
||||||
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
|
'Use Recaptcha v1 in Reports': [false, 'Use the text captcha in the report window.'],
|
||||||
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
|
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
|
||||||
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
|
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
|
||||||
},
|
},
|
||||||
@ -434,7 +434,7 @@
|
|||||||
doc = d.documentElement;
|
doc = d.documentElement;
|
||||||
|
|
||||||
g = {
|
g = {
|
||||||
VERSION: '1.11.22.1',
|
VERSION: '1.11.22.2',
|
||||||
NAMESPACE: '4chan X.',
|
NAMESPACE: '4chan X.',
|
||||||
boards: {}
|
boards: {}
|
||||||
};
|
};
|
||||||
@ -8158,18 +8158,10 @@
|
|||||||
|
|
||||||
Captcha.replace = {
|
Captcha.replace = {
|
||||||
init: function() {
|
init: function() {
|
||||||
var type;
|
|
||||||
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
|
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
|
if (((Conf['Use Recaptcha v1'] && location.hostname === 'boards.4chan.org') || (Conf['Use Recaptcha v1 in Reports'] && location.hostname === 'sys.4chan.org')) && Main.jsEnabled) {
|
||||||
if (Conf['Use Recaptcha v2 in Reports']) {
|
|
||||||
type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
|
|
||||||
$.ready(Captcha.replace[type]);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
|
|
||||||
$.ready(Captcha.replace.v1);
|
$.ready(Captcha.replace.v1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -8226,29 +8218,6 @@
|
|||||||
return Captcha.v1.create();
|
return Captcha.v1.create();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
v2: function() {
|
|
||||||
var container, lang, old, script, url;
|
|
||||||
if (!(old = $.id('captchaContainerAlt'))) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
container = $.el('div', {
|
|
||||||
className: 'g-recaptcha'
|
|
||||||
});
|
|
||||||
$.extend(container.dataset, {
|
|
||||||
sitekey: '6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc',
|
|
||||||
tabindex: 3
|
|
||||||
});
|
|
||||||
$.replace(old, container);
|
|
||||||
url = 'https://www.google.com/recaptcha/api.js';
|
|
||||||
if ((lang = Conf['captchaLanguage'].trim())) {
|
|
||||||
url += "?hl=" + (encodeURIComponent(lang));
|
|
||||||
}
|
|
||||||
script = $.el('script', {
|
|
||||||
src: url
|
|
||||||
});
|
|
||||||
$.add(d.head, script);
|
|
||||||
return $.onExists(d.body, 'iframe', Captcha.replace.autocopy);
|
|
||||||
},
|
|
||||||
iframe: function(iframe) {
|
iframe: function(iframe) {
|
||||||
var lang, src;
|
var lang, src;
|
||||||
if ((lang = Conf['captchaLanguage'].trim())) {
|
if ((lang = Conf['captchaLanguage'].trim())) {
|
||||||
@ -12880,14 +12849,14 @@
|
|||||||
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
|
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
|
||||||
a.textContent = 'Report';
|
a.textContent = 'Report';
|
||||||
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
|
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
|
||||||
ReportLink.height = 180;
|
ReportLink.dims = 'width=400,height=550';
|
||||||
} else if (Conf['Archive Report']) {
|
} else if (Conf['Archive Report']) {
|
||||||
a.textContent = 'Report to archive';
|
a.textContent = 'Report to archive';
|
||||||
ReportLink.url = Redirect.to('report', {
|
ReportLink.url = Redirect.to('report', {
|
||||||
boardID: post.board.ID,
|
boardID: post.board.ID,
|
||||||
postID: post.ID
|
postID: post.ID
|
||||||
});
|
});
|
||||||
ReportLink.height = 350;
|
ReportLink.dims = 'width=700,height=475';
|
||||||
} else {
|
} else {
|
||||||
ReportLink.url = '';
|
ReportLink.url = '';
|
||||||
}
|
}
|
||||||
@ -12896,10 +12865,10 @@
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
report: function() {
|
report: function() {
|
||||||
var height, id, set, url;
|
var dims, id, set, url;
|
||||||
url = ReportLink.url, height = ReportLink.height;
|
url = ReportLink.url, dims = ReportLink.dims;
|
||||||
id = Date.now();
|
id = Date.now();
|
||||||
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
|
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1," + dims;
|
||||||
return window.open(url, id, set);
|
return window.open(url, id, set);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -16647,7 +16616,7 @@
|
|||||||
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
|
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
|
||||||
if (location.hash === '#redirect') {
|
if (location.hash === '#redirect') {
|
||||||
$.globalEval('self.close = function(){};');
|
$.globalEval('self.close = function(){};');
|
||||||
window.resizeBy(0, 350 - doc.clientHeight);
|
window.resizeTo(700, 475);
|
||||||
location.replace(url);
|
location.replace(url);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -16658,7 +16627,7 @@
|
|||||||
});
|
});
|
||||||
$.on(link, 'click', function(e) {
|
$.on(link, 'click', function(e) {
|
||||||
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
|
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
|
||||||
return window.resizeBy(0, 350 - doc.clientHeight);
|
return window.resizeTo(700, 475);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
|
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
|
||||||
@ -17310,6 +17279,11 @@
|
|||||||
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
|
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (compareString < '00001.00011.00022.00002') {
|
||||||
|
if ((data['Use Recaptcha v1 in Reports'] == null) && data['Use Recaptcha v1'] && !data['Use Recaptcha v2 in Reports']) {
|
||||||
|
set('Use Recaptcha v1 in Reports', true);
|
||||||
|
}
|
||||||
|
}
|
||||||
return changes;
|
return changes;
|
||||||
},
|
},
|
||||||
loadSettings: function(data, cb) {
|
loadSettings: function(data, cb) {
|
||||||
|
|||||||
Binary file not shown.
@ -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.22.1' />
|
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.22.2' />
|
||||||
</app>
|
</app>
|
||||||
</gupdate>
|
</gupdate>
|
||||||
|
|
||||||
|
|||||||
@ -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.22.1' />
|
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.22.2' />
|
||||||
</app>
|
</app>
|
||||||
</gupdate>
|
</gupdate>
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"version": "1.11.22.1",
|
"version": "1.11.22.2",
|
||||||
"date": "2016-01-12T10:18:55.491Z"
|
"date": "2016-01-18T16:37:54.258Z"
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user