Merge branch 'bstable'

This commit is contained in:
ccd0 2021-07-07 20:58:02 -07:00
commit f0c7afeded
17 changed files with 35 additions and 22 deletions

View File

@ -4,6 +4,9 @@
### v1.14.21
**v1.14.21.6** *(2021-07-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.6/builds/4chan-X-noupdate.crx)]
- Captcha related bugfixes.
**v1.14.21.5** *(2021-07-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.5/builds/4chan-X-noupdate.crx)]
- Fix bug causing captcha to sometimes not work when replying from index.

Binary file not shown.

View File

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

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
// @version 1.14.21.5
// @version 1.14.21.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -218,7 +218,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.21.5',
VERSION: '1.14.21.6',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@ -23805,7 +23805,10 @@ Captcha = {};
},
updateThread: function() {
var boardID, newThread, ref, threadID;
ref = Captcha.t.currentThread, boardID = ref.boardID, threadID = ref.threadID;
if (!this.isEnabled) {
return;
}
ref = Captcha.t.currentThread || {}, boardID = ref.boardID, threadID = ref.threadID;
newThread = Captcha.t.getThread();
if (!(newThread.boardID === boardID && newThread.threadID === threadID)) {
Captcha.t.destroy();
@ -24295,7 +24298,7 @@ QR = (function() {
},
initReady: function() {
var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop;
captchaVersion = $('#t-root') ? 't' : 'v2';
captchaVersion = $('#g-recaptcha, #captcha-forced-noscript') ? 'v2' : 't';
QR.captcha = Captcha[captchaVersion];
QR.postingIsEnabled = true;
config = g.BOARD.config;

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.14.21.5
// @version 1.14.21.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -218,7 +218,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.21.5',
VERSION: '1.14.21.6',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@ -23805,7 +23805,10 @@ Captcha = {};
},
updateThread: function() {
var boardID, newThread, ref, threadID;
ref = Captcha.t.currentThread, boardID = ref.boardID, threadID = ref.threadID;
if (!this.isEnabled) {
return;
}
ref = Captcha.t.currentThread || {}, boardID = ref.boardID, threadID = ref.threadID;
newThread = Captcha.t.getThread();
if (!(newThread.boardID === boardID && newThread.threadID === threadID)) {
Captcha.t.destroy();
@ -24295,7 +24298,7 @@ QR = (function() {
},
initReady: function() {
var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop;
captchaVersion = $('#t-root') ? 't' : 'v2';
captchaVersion = $('#g-recaptcha, #captcha-forced-noscript') ? 'v2' : 't';
QR.captcha = Captcha[captchaVersion];
QR.postingIsEnabled = true;
config = g.BOARD.config;

Binary file not shown.

View File

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

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.14.21.5
// @version 1.14.21.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -218,7 +218,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.21.5',
VERSION: '1.14.21.6',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@ -23805,7 +23805,10 @@ Captcha = {};
},
updateThread: function() {
var boardID, newThread, ref, threadID;
ref = Captcha.t.currentThread, boardID = ref.boardID, threadID = ref.threadID;
if (!this.isEnabled) {
return;
}
ref = Captcha.t.currentThread || {}, boardID = ref.boardID, threadID = ref.threadID;
newThread = Captcha.t.getThread();
if (!(newThread.boardID === boardID && newThread.threadID === threadID)) {
Captcha.t.destroy();
@ -24295,7 +24298,7 @@ QR = (function() {
},
initReady: function() {
var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop;
captchaVersion = $('#t-root') ? 't' : 'v2';
captchaVersion = $('#g-recaptcha, #captcha-forced-noscript') ? 'v2' : 't';
QR.captcha = Captcha[captchaVersion];
QR.postingIsEnabled = true;
config = g.BOARD.config;

Binary file not shown.

View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
"version": "1.14.21.5",
"version": "1.14.21.6",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]

View File

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

View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
"version": "1.14.21.5",
"version": "1.14.21.6",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]

View File

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

View File

@ -48,7 +48,8 @@ Captcha.t =
delete @nodes.container
updateThread: ->
{boardID, threadID} = Captcha.t.currentThread
return unless @isEnabled
{boardID, threadID} = (Captcha.t.currentThread or {})
newThread = Captcha.t.getThread()
unless newThread.boardID is boardID and newThread.threadID is threadID
Captcha.t.destroy()

View File

@ -48,7 +48,7 @@ QR =
Header.addShortcut 'qr', sc, 540
initReady: ->
captchaVersion = if $('#t-root') then 't' else 'v2'
captchaVersion = if $('#g-recaptcha, #captcha-forced-noscript') then 'v2' else 't'
QR.captcha = Captcha[captchaVersion]
QR.postingIsEnabled = true

View File

@ -1,4 +1,4 @@
{
"version": "1.14.21.5",
"date": "2021-07-07T06:16:45.892Z"
"version": "1.14.21.6",
"date": "2021-07-08T03:54:56.178Z"
}