diff --git a/CHANGELOG.md b/CHANGELOG.md
index 379d1eb85..a05ed4abf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
### v1.14.1
+**v1.14.1.2** *(2018-05-25)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.1.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.1.2/builds/4chan-X-noupdate.crx)]
+- Disable JS whitelist if 4chan X loads too late for it to be effective.
+
**v1.14.1.1** *(2018-05-18)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.1.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.1.1/builds/4chan-X-noupdate.crx)]
- Possible fix for data loss issues. #1875
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 175b1190a..f383454d7 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 b14a5c0c0..550b8d2a5 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.14.1.1
+// @version 1.14.1.2
// @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 1d07a3724..a8f000f85 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.14.1.1
+// @version 1.14.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.1.1',
+ VERSION: '1.14.1.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -24554,7 +24554,9 @@ Main = (function() {
Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true;
- if (/\.4chan\.org$/.test(location.hostname)) {
+ if (/\.4chan\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) {
+ return /this\[/.test(s.textContent);
+ }).length) {
($.getSync || $.get)({
'jsWhitelist': Conf['jsWhitelist']
}, function(arg) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 133eb85cd..b5fbb98d5 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 ed37b566e..b372c8ccf 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.14.1.1
+// @version 1.14.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.1.1',
+ VERSION: '1.14.1.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -24554,7 +24554,9 @@ Main = (function() {
Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true;
- if (/\.4chan\.org$/.test(location.hostname)) {
+ if (/\.4chan\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) {
+ return /this\[/.test(s.textContent);
+ }).length) {
($.getSync || $.get)({
'jsWhitelist': Conf['jsWhitelist']
}, function(arg) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 9e027873b..ce4fe5597 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 c835487aa..31f12cd5e 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.1.1
+// @version 1.14.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 72abe48d0..519a00ddf 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.1.1
+// @version 1.14.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.1.1',
+ VERSION: '1.14.1.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -24554,7 +24554,9 @@ Main = (function() {
Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true;
- if (/\.4chan\.org$/.test(location.hostname)) {
+ if (/\.4chan\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) {
+ return /this\[/.test(s.textContent);
+ }).length) {
($.getSync || $.get)({
'jsWhitelist': Conf['jsWhitelist']
}, function(arg) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 2c3765a93..4f711db76 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.json b/builds/updates-beta.json
index e7d1d4197..d9a256291 100644
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.1.1",
+ "version": "1.14.1.2",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index b164ec2e4..09270ce45 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.json b/builds/updates.json
index 002e69f96..c69567644 100644
--- a/builds/updates.json
+++ b/builds/updates.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.1.1",
+ "version": "1.14.1.2",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]
diff --git a/builds/updates.xml b/builds/updates.xml
index 5da618670..7d771be1d 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index f07473e56..261970535 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.14.1.1",
- "date": "2018-05-18T07:43:02.412Z"
+ "version": "1.14.1.2",
+ "date": "2018-05-25T00:09:59.391Z"
}
\ No newline at end of file