diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f93e944b..114d29e6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
### v1.13.8
+**v1.13.8.5** *(2017-03-13)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.5/builds/4chan-X-noupdate.crx)]
+- WebM with audio is now allowed on /wsr/ and /r/. #1319
+- Minor bugfixes.
+
**v1.13.8.4** *(2017-02-21)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.4/builds/4chan-X-noupdate.crx)]
- As a workaround for 4chan's recent removal of the ability to start new threads using the v1 (text) Recaptcha, the `Use Recaptcha v1` option now only applies within threads. You can enable the new option `Use Recaptcha v1 on Index` to get Recaptcha v1 in the index and catalog, but unless 4chan's change is reverted, this will interfere with starting threads.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 5118386b3..135a42930 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index e1c45be71..25420b34e 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.13.8.4
+// @version 1.13.8.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 9d5a3c23a..3b1d2c808 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.13.8.4
+// @version 1.13.8.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -151,7 +151,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.8.4',
+ VERSION: '1.13.8.5',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -1332,6 +1332,9 @@ body > div[style*=\" top: -10000px;\"] {\n\
word-wrap: break-word;\n\
max-width: calc(100vw - 90px);\n\
}\n\
+body.is_catalog .thread > a > img {\n\
+ display: inline-block;\n\
+}\n\
/* Ads */\n\
.ad-cnt > *, .adg-rects > * {\n\
height: auto !important;\n\
@@ -13993,7 +13996,7 @@ Volume = (function() {
cb: this.node
});
}
- if ((ref1 = g.BOARD.ID) !== 'gif' && ref1 !== 'wsg') {
+ if ((ref1 = g.BOARD.ID) !== 'gif' && ref1 !== 'wsg' && ref1 !== 'r' && ref1 !== 'wsr') {
return;
}
if (Conf['Mouse Wheel Volume']) {
@@ -19741,10 +19744,14 @@ Captcha = {};
this.captchas = captchas;
return this.count();
},
- getOne: function() {
- var captcha;
+ getOne: function(isReply) {
+ var captcha, i;
this.clear();
- if ((captcha = this.captchas.shift())) {
+ i = this.captchas.findIndex(function(x) {
+ return isReply || (x.challenge == null);
+ });
+ if (i >= 0) {
+ captcha = this.captchas.splice(i, 1)[0];
$.set('captchas', this.captchas);
this.count();
return captcha;
@@ -20283,9 +20290,9 @@ Captcha = {};
return this.beforeSetup();
}
},
- getOne: function() {
+ getOne: function(isReply) {
var captcha, challenge, response, timeout;
- if ((captcha = Captcha.cache.getOne())) {
+ if ((captcha = Captcha.cache.getOne(isReply))) {
return captcha;
} else {
challenge = this.nodes.img.alt;
@@ -20609,8 +20616,8 @@ Captcha = {};
$.rm(node);
}
},
- getOne: function() {
- return Captcha.cache.getOne();
+ getOne: function(isReply) {
+ return Captcha.cache.getOne(isReply);
},
save: function(pasted, token) {
var base, focus, ref;
@@ -21501,7 +21508,7 @@ QR = (function() {
err || (err = 'Original comment required.');
}
if (QR.captcha.isEnabled && !err) {
- captcha = QR.captcha.getOne();
+ captcha = QR.captcha.getOne(!!threadID);
if (!captcha) {
err = 'No valid captcha.';
QR.captcha.setup(!QR.cooldown.auto || d.activeElement === QR.nodes.status);
@@ -22629,7 +22636,7 @@ QR = (function() {
} else if (duration > QR.max_duration_video) {
this.fileError("Video too long (video: " + duration + "s, max: " + QR.max_duration_video + "s)");
}
- if (((ref = g.BOARD.ID) !== 'gif' && ref !== 'wsg') && $.hasAudio(el)) {
+ if (((ref = g.BOARD.ID) !== 'gif' && ref !== 'wsg' && ref !== 'r' && ref !== 'wsr') && $.hasAudio(el)) {
return this.fileError('Audio not allowed');
}
}
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 3ff9d2d0e..d54d0828e 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 39607ac51..4e32e229a 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.8.4
+// @version 1.13.8.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -151,7 +151,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.8.4',
+ VERSION: '1.13.8.5',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -1332,6 +1332,9 @@ body > div[style*=\" top: -10000px;\"] {\n\
word-wrap: break-word;\n\
max-width: calc(100vw - 90px);\n\
}\n\
+body.is_catalog .thread > a > img {\n\
+ display: inline-block;\n\
+}\n\
/* Ads */\n\
.ad-cnt > *, .adg-rects > * {\n\
height: auto !important;\n\
@@ -13993,7 +13996,7 @@ Volume = (function() {
cb: this.node
});
}
- if ((ref1 = g.BOARD.ID) !== 'gif' && ref1 !== 'wsg') {
+ if ((ref1 = g.BOARD.ID) !== 'gif' && ref1 !== 'wsg' && ref1 !== 'r' && ref1 !== 'wsr') {
return;
}
if (Conf['Mouse Wheel Volume']) {
@@ -19741,10 +19744,14 @@ Captcha = {};
this.captchas = captchas;
return this.count();
},
- getOne: function() {
- var captcha;
+ getOne: function(isReply) {
+ var captcha, i;
this.clear();
- if ((captcha = this.captchas.shift())) {
+ i = this.captchas.findIndex(function(x) {
+ return isReply || (x.challenge == null);
+ });
+ if (i >= 0) {
+ captcha = this.captchas.splice(i, 1)[0];
$.set('captchas', this.captchas);
this.count();
return captcha;
@@ -20283,9 +20290,9 @@ Captcha = {};
return this.beforeSetup();
}
},
- getOne: function() {
+ getOne: function(isReply) {
var captcha, challenge, response, timeout;
- if ((captcha = Captcha.cache.getOne())) {
+ if ((captcha = Captcha.cache.getOne(isReply))) {
return captcha;
} else {
challenge = this.nodes.img.alt;
@@ -20609,8 +20616,8 @@ Captcha = {};
$.rm(node);
}
},
- getOne: function() {
- return Captcha.cache.getOne();
+ getOne: function(isReply) {
+ return Captcha.cache.getOne(isReply);
},
save: function(pasted, token) {
var base, focus, ref;
@@ -21501,7 +21508,7 @@ QR = (function() {
err || (err = 'Original comment required.');
}
if (QR.captcha.isEnabled && !err) {
- captcha = QR.captcha.getOne();
+ captcha = QR.captcha.getOne(!!threadID);
if (!captcha) {
err = 'No valid captcha.';
QR.captcha.setup(!QR.cooldown.auto || d.activeElement === QR.nodes.status);
@@ -22629,7 +22636,7 @@ QR = (function() {
} else if (duration > QR.max_duration_video) {
this.fileError("Video too long (video: " + duration + "s, max: " + QR.max_duration_video + "s)");
}
- if (((ref = g.BOARD.ID) !== 'gif' && ref !== 'wsg') && $.hasAudio(el)) {
+ if (((ref = g.BOARD.ID) !== 'gif' && ref !== 'wsg' && ref !== 'r' && ref !== 'wsr') && $.hasAudio(el)) {
return this.fileError('Audio not allowed');
}
}
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 2eab8e834..9d7266758 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index f9e17f4c9..18243a430 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.8.4
+// @version 1.13.8.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 5ce942ba7..93e41f3c9 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.8.4
+// @version 1.13.8.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -151,7 +151,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.8.4',
+ VERSION: '1.13.8.5',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -1332,6 +1332,9 @@ body > div[style*=\" top: -10000px;\"] {\n\
word-wrap: break-word;\n\
max-width: calc(100vw - 90px);\n\
}\n\
+body.is_catalog .thread > a > img {\n\
+ display: inline-block;\n\
+}\n\
/* Ads */\n\
.ad-cnt > *, .adg-rects > * {\n\
height: auto !important;\n\
@@ -13993,7 +13996,7 @@ Volume = (function() {
cb: this.node
});
}
- if ((ref1 = g.BOARD.ID) !== 'gif' && ref1 !== 'wsg') {
+ if ((ref1 = g.BOARD.ID) !== 'gif' && ref1 !== 'wsg' && ref1 !== 'r' && ref1 !== 'wsr') {
return;
}
if (Conf['Mouse Wheel Volume']) {
@@ -19741,10 +19744,14 @@ Captcha = {};
this.captchas = captchas;
return this.count();
},
- getOne: function() {
- var captcha;
+ getOne: function(isReply) {
+ var captcha, i;
this.clear();
- if ((captcha = this.captchas.shift())) {
+ i = this.captchas.findIndex(function(x) {
+ return isReply || (x.challenge == null);
+ });
+ if (i >= 0) {
+ captcha = this.captchas.splice(i, 1)[0];
$.set('captchas', this.captchas);
this.count();
return captcha;
@@ -20283,9 +20290,9 @@ Captcha = {};
return this.beforeSetup();
}
},
- getOne: function() {
+ getOne: function(isReply) {
var captcha, challenge, response, timeout;
- if ((captcha = Captcha.cache.getOne())) {
+ if ((captcha = Captcha.cache.getOne(isReply))) {
return captcha;
} else {
challenge = this.nodes.img.alt;
@@ -20609,8 +20616,8 @@ Captcha = {};
$.rm(node);
}
},
- getOne: function() {
- return Captcha.cache.getOne();
+ getOne: function(isReply) {
+ return Captcha.cache.getOne(isReply);
},
save: function(pasted, token) {
var base, focus, ref;
@@ -21501,7 +21508,7 @@ QR = (function() {
err || (err = 'Original comment required.');
}
if (QR.captcha.isEnabled && !err) {
- captcha = QR.captcha.getOne();
+ captcha = QR.captcha.getOne(!!threadID);
if (!captcha) {
err = 'No valid captcha.';
QR.captcha.setup(!QR.cooldown.auto || d.activeElement === QR.nodes.status);
@@ -22629,7 +22636,7 @@ QR = (function() {
} else if (duration > QR.max_duration_video) {
this.fileError("Video too long (video: " + duration + "s, max: " + QR.max_duration_video + "s)");
}
- if (((ref = g.BOARD.ID) !== 'gif' && ref !== 'wsg') && $.hasAudio(el)) {
+ if (((ref = g.BOARD.ID) !== 'gif' && ref !== 'wsg' && ref !== 'r' && ref !== 'wsr') && $.hasAudio(el)) {
return this.fileError('Audio not allowed');
}
}
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 4a0e20a73..76e08958b 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 264a31b12..5bec57af6 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.xml b/builds/updates.xml
index 343d11614..0cb3d308c 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index 66de6842e..1988f5d50 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.13.8.4",
- "date": "2017-02-21T05:22:04.853Z"
+ "version": "1.13.8.5",
+ "date": "2017-03-13T22:21:21.751Z"
}
\ No newline at end of file