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

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2019-08-26 19:29:55 -07:00
commit b1a4e83c94
15 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@
### v1.14.12 ### v1.14.12
**v1.14.12.10** *(2019-08-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.10/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.10/builds/4chan-X-noupdate.crx)]
- Turn clicking to open in Gallery off on Tinyboard sites when JS enabled to avoid conflict with native image expansion.
**v1.14.12.9** *(2019-08-22)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.9/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.9/builds/4chan-X-noupdate.crx)] **v1.14.12.9** *(2019-08-22)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.9/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.9/builds/4chan-X-noupdate.crx)]
- Add option to enable/disable notification on quick filtering MD5s. #2408 - Add option to enable/disable notification on quick filtering MD5s. #2408
- Suggest disabling JSON Index if catalog.json is loading slowly. #2412 - Suggest disabling JSON Index if catalog.json is loading slowly. #2412

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.14.12.9 // @version 1.14.12.10
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.14.12.9 // @version 1.14.12.10
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -219,7 +219,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.12.9', VERSION: '1.14.12.10',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
sites: Object.create(null), sites: Object.create(null),
boards: Object.create(null) boards: Object.create(null)
@ -14402,7 +14402,7 @@ Gallery = (function() {
Gallery.generateThumb(this, file); Gallery.generateThumb(this, file);
Gallery.nodes.total.textContent = Gallery.images.length; Gallery.nodes.total.textContent = Gallery.images.length;
} }
if (!Conf['Image Expansion']) { if (!(Conf['Image Expansion'] || (g.SITE.software === 'tinyboard' && Main.jsEnabled))) {
results.push($.on(file.thumbLink, 'click', Gallery.cb.image)); results.push($.on(file.thumbLink, 'click', Gallery.cb.image));
} else { } else {
results.push(void 0); results.push(void 0);

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

Binary file not shown.

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.14.12.9 // @version 1.14.12.10
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -219,7 +219,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.12.9', VERSION: '1.14.12.10',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
sites: Object.create(null), sites: Object.create(null),
boards: Object.create(null) boards: Object.create(null)
@ -14402,7 +14402,7 @@ Gallery = (function() {
Gallery.generateThumb(this, file); Gallery.generateThumb(this, file);
Gallery.nodes.total.textContent = Gallery.images.length; Gallery.nodes.total.textContent = Gallery.images.length;
} }
if (!Conf['Image Expansion']) { if (!(Conf['Image Expansion'] || (g.SITE.software === 'tinyboard' && Main.jsEnabled))) {
results.push($.on(file.thumbLink, 'click', Gallery.cb.image)); results.push($.on(file.thumbLink, 'click', Gallery.cb.image));
} else { } else {
results.push(void 0); results.push(void 0);

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.14.12.9 // @version 1.14.12.10
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.14.12.9 // @version 1.14.12.10
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -219,7 +219,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.12.9', VERSION: '1.14.12.10',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
sites: Object.create(null), sites: Object.create(null),
boards: Object.create(null) boards: Object.create(null)
@ -14402,7 +14402,7 @@ Gallery = (function() {
Gallery.generateThumb(this, file); Gallery.generateThumb(this, file);
Gallery.nodes.total.textContent = Gallery.images.length; Gallery.nodes.total.textContent = Gallery.images.length;
} }
if (!Conf['Image Expansion']) { if (!(Conf['Image Expansion'] || (g.SITE.software === 'tinyboard' && Main.jsEnabled))) {
results.push($.on(file.thumbLink, 'click', Gallery.cb.image)); results.push($.on(file.thumbLink, 'click', Gallery.cb.image));
} else { } else {
results.push(void 0); results.push(void 0);

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.14.12.9", "version": "1.14.12.10",
"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.14.12.9' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.12.10' />
</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.14.12.9", "version": "1.14.12.10",
"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.14.12.9' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.12.10' />
</app> </app>
</gupdate> </gupdate>

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.14.12.9", "version": "1.14.12.10",
"date": "2019-08-22T22:12:16.150Z" "date": "2019-08-27T02:25:18.242Z"
} }