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

Release 4chan X v1.13.14.6.

Browse Source
This commit is contained in:
ccd0 2017-11-04 18:43:40 -07:00
parent f36dbfc669
commit a604d7b799
15 changed files with 57 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@
### v1.13.14 ### v1.13.14
**v1.13.14.6** *(2017-11-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.6/builds/4chan-X-noupdate.crx)]
- Turn 'Force Noscript Captcha for v1' off by default in GM4 due to missing frame support.
- Fix bugs related to 4chan's ads.
**v1.13.14.5** *(2017-10-30)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.crx)] **v1.13.14.5** *(2017-10-30)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.crx)]
- Merge v1.13.13.3: Update for Halloween theme compatibility. - Merge v1.13.13.3: Update for Halloween theme compatibility.

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

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

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

27
builds/4chan-X-beta.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.13.14.5 // @version 1.13.14.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -159,7 +159,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.14.5', VERSION: '1.13.14.6',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -24568,7 +24568,7 @@ Main = (function() {
Main = { Main = {
init: function() { init: function() {
var db, flatten, i, items, j, k, key, len, ref, w; var db, flatten, i, items, j, k, key, len, ref, ref1, w;
if (d.body && !$('title', d.head)) { if (d.body && !$('title', d.head)) {
return; return;
} }
@ -24601,7 +24601,7 @@ Main = (function() {
return; return;
} }
try { try {
if (window.frameElement && window.frameElement.src === '') { if (window.frameElement && ((ref = window.frameElement.src) === '' || ref === 'about:blank')) {
return; return;
} }
} catch (_error) {} } catch (_error) {}
@ -24630,9 +24630,9 @@ Main = (function() {
} }
}; };
flatten(null, Config); flatten(null, Config);
ref = DataBoard.keys; ref1 = DataBoard.keys;
for (j = 0, len = ref.length; j < len; j++) { for (j = 0, len = ref1.length; j < len; j++) {
db = ref[j]; db = ref1[j];
Conf[db] = { Conf[db] = {
boards: {} boards: {}
}; };
@ -24654,6 +24654,9 @@ Main = (function() {
Conf['QR Shortcut'] = true; Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true; Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true; Conf['Toggleable Thread Watcher'] = true;
if ($.engine === 'gecko' && (typeof GM !== "undefined" && GM !== null)) {
Conf['Force Noscript Captcha for v1'] = false;
}
($.getSync || $.get)({ ($.getSync || $.get)({
'jsWhitelist': Conf['jsWhitelist'] 'jsWhitelist': Conf['jsWhitelist']
}, function(arg) { }, function(arg) {
@ -24667,13 +24670,13 @@ Main = (function() {
} }
items['previousversion'] = void 0; items['previousversion'] = void 0;
return ($.getSync || $.get)(items, function(items) { return ($.getSync || $.get)(items, function(items) {
var ref1; var ref2;
if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { if (!$.perProtocolSettings && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
location.replace('https:' + location.host + location.pathname + location.search + location.hash); location.replace('https:' + location.host + location.pathname + location.search + location.hash);
return; return;
} }
return $.asap(docSet, function() { return $.asap(docSet, function() {
var ref2, val; var ref3, val;
if ($.cantSet) { if ($.cantSet) {
} else if (items.previousversion == null) { } else if (items.previousversion == null) {
@ -24686,7 +24689,7 @@ Main = (function() {
} }
for (key in Conf) { for (key in Conf) {
val = Conf[key]; val = Conf[key];
Conf[key] = (ref2 = items[key]) != null ? ref2 : val; Conf[key] = (ref3 = items[key]) != null ? ref3 : val;
} }
return Main.initFeatures(); return Main.initFeatures();
}); });
@ -24819,7 +24822,7 @@ Main = (function() {
if ($.engine) { if ($.engine) {
$.addClass(doc, "ua-" + $.engine); $.addClass(doc, "ua-" + $.engine);
} }
$.onExists(doc, '.ad-cnt, .adg-rects', function(ad) { $.onExists(doc, '.ad-cnt, .adg-rects > .desktop', function(ad) {
return $.onExists(ad, 'img, iframe', function() { return $.onExists(ad, 'img, iframe', function() {
return $.addClass(doc, 'ads-loaded'); return $.addClass(doc, 'ads-loaded');
}); });

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

27
builds/4chan-X-noupdate.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.14.5 // @version 1.13.14.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -159,7 +159,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.14.5', VERSION: '1.13.14.6',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -24568,7 +24568,7 @@ Main = (function() {
Main = { Main = {
init: function() { init: function() {
var db, flatten, i, items, j, k, key, len, ref, w; var db, flatten, i, items, j, k, key, len, ref, ref1, w;
if (d.body && !$('title', d.head)) { if (d.body && !$('title', d.head)) {
return; return;
} }
@ -24601,7 +24601,7 @@ Main = (function() {
return; return;
} }
try { try {
if (window.frameElement && window.frameElement.src === '') { if (window.frameElement && ((ref = window.frameElement.src) === '' || ref === 'about:blank')) {
return; return;
} }
} catch (_error) {} } catch (_error) {}
@ -24630,9 +24630,9 @@ Main = (function() {
} }
}; };
flatten(null, Config); flatten(null, Config);
ref = DataBoard.keys; ref1 = DataBoard.keys;
for (j = 0, len = ref.length; j < len; j++) { for (j = 0, len = ref1.length; j < len; j++) {
db = ref[j]; db = ref1[j];
Conf[db] = { Conf[db] = {
boards: {} boards: {}
}; };
@ -24654,6 +24654,9 @@ Main = (function() {
Conf['QR Shortcut'] = true; Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true; Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true; Conf['Toggleable Thread Watcher'] = true;
if ($.engine === 'gecko' && (typeof GM !== "undefined" && GM !== null)) {
Conf['Force Noscript Captcha for v1'] = false;
}
($.getSync || $.get)({ ($.getSync || $.get)({
'jsWhitelist': Conf['jsWhitelist'] 'jsWhitelist': Conf['jsWhitelist']
}, function(arg) { }, function(arg) {
@ -24667,13 +24670,13 @@ Main = (function() {
} }
items['previousversion'] = void 0; items['previousversion'] = void 0;
return ($.getSync || $.get)(items, function(items) { return ($.getSync || $.get)(items, function(items) {
var ref1; var ref2;
if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { if (!$.perProtocolSettings && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
location.replace('https:' + location.host + location.pathname + location.search + location.hash); location.replace('https:' + location.host + location.pathname + location.search + location.hash);
return; return;
} }
return $.asap(docSet, function() { return $.asap(docSet, function() {
var ref2, val; var ref3, val;
if ($.cantSet) { if ($.cantSet) {
} else if (items.previousversion == null) { } else if (items.previousversion == null) {
@ -24686,7 +24689,7 @@ Main = (function() {
} }
for (key in Conf) { for (key in Conf) {
val = Conf[key]; val = Conf[key];
Conf[key] = (ref2 = items[key]) != null ? ref2 : val; Conf[key] = (ref3 = items[key]) != null ? ref3 : val;
} }
return Main.initFeatures(); return Main.initFeatures();
}); });
@ -24819,7 +24822,7 @@ Main = (function() {
if ($.engine) { if ($.engine) {
$.addClass(doc, "ua-" + $.engine); $.addClass(doc, "ua-" + $.engine);
} }
$.onExists(doc, '.ad-cnt, .adg-rects', function(ad) { $.onExists(doc, '.ad-cnt, .adg-rects > .desktop', function(ad) {
return $.onExists(ad, 'img, iframe', function() { return $.onExists(ad, 'img, iframe', function() {
return $.addClass(doc, 'ads-loaded'); return $.addClass(doc, 'ads-loaded');
}); });

BIN
builds/4chan-X.crx
View File

Binary file not shown.

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

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

27
builds/4chan-X.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.14.5 // @version 1.13.14.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -159,7 +159,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.14.5', VERSION: '1.13.14.6',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -24568,7 +24568,7 @@ Main = (function() {
Main = { Main = {
init: function() { init: function() {
var db, flatten, i, items, j, k, key, len, ref, w; var db, flatten, i, items, j, k, key, len, ref, ref1, w;
if (d.body && !$('title', d.head)) { if (d.body && !$('title', d.head)) {
return; return;
} }
@ -24601,7 +24601,7 @@ Main = (function() {
return; return;
} }
try { try {
if (window.frameElement && window.frameElement.src === '') { if (window.frameElement && ((ref = window.frameElement.src) === '' || ref === 'about:blank')) {
return; return;
} }
} catch (_error) {} } catch (_error) {}
@ -24630,9 +24630,9 @@ Main = (function() {
} }
}; };
flatten(null, Config); flatten(null, Config);
ref = DataBoard.keys; ref1 = DataBoard.keys;
for (j = 0, len = ref.length; j < len; j++) { for (j = 0, len = ref1.length; j < len; j++) {
db = ref[j]; db = ref1[j];
Conf[db] = { Conf[db] = {
boards: {} boards: {}
}; };
@ -24654,6 +24654,9 @@ Main = (function() {
Conf['QR Shortcut'] = true; Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true; Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true; Conf['Toggleable Thread Watcher'] = true;
if ($.engine === 'gecko' && (typeof GM !== "undefined" && GM !== null)) {
Conf['Force Noscript Captcha for v1'] = false;
}
($.getSync || $.get)({ ($.getSync || $.get)({
'jsWhitelist': Conf['jsWhitelist'] 'jsWhitelist': Conf['jsWhitelist']
}, function(arg) { }, function(arg) {
@ -24667,13 +24670,13 @@ Main = (function() {
} }
items['previousversion'] = void 0; items['previousversion'] = void 0;
return ($.getSync || $.get)(items, function(items) { return ($.getSync || $.get)(items, function(items) {
var ref1; var ref2;
if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { if (!$.perProtocolSettings && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
location.replace('https:' + location.host + location.pathname + location.search + location.hash); location.replace('https:' + location.host + location.pathname + location.search + location.hash);
return; return;
} }
return $.asap(docSet, function() { return $.asap(docSet, function() {
var ref2, val; var ref3, val;
if ($.cantSet) { if ($.cantSet) {
} else if (items.previousversion == null) { } else if (items.previousversion == null) {
@ -24686,7 +24689,7 @@ Main = (function() {
} }
for (key in Conf) { for (key in Conf) {
val = Conf[key]; val = Conf[key];
Conf[key] = (ref2 = items[key]) != null ? ref2 : val; Conf[key] = (ref3 = items[key]) != null ? ref3 : val;
} }
return Main.initFeatures(); return Main.initFeatures();
}); });
@ -24819,7 +24822,7 @@ Main = (function() {
if ($.engine) { if ($.engine) {
$.addClass(doc, "ua-" + $.engine); $.addClass(doc, "ua-" + $.engine);
} }
$.onExists(doc, '.ad-cnt, .adg-rects', function(ad) { $.onExists(doc, '.ad-cnt, .adg-rects > .desktop', function(ad) {
return $.onExists(ad, 'img, iframe', function() { return $.onExists(ad, 'img, iframe', function() {
return $.addClass(doc, 'ads-loaded'); return $.addClass(doc, 'ads-loaded');
}); });

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.json
View File

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

2
builds/updates-beta.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://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.14.5' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.14.6' />
</app> </app>
</gupdate> </gupdate>

2
builds/updates.json
View File

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

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://www.4chan-x.net/builds/4chan-X.crx' version='1.13.14.5' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.14.6' />
</app> </app>
</gupdate> </gupdate>

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.13.14.5", "version": "1.13.14.6",
"date": "2017-10-30T16:54:06.453Z" "date": "2017-11-05T01:38:05.709Z"
} }