diff --git a/CHANGELOG.md b/CHANGELOG.md index 0163e43dc..1ddc924e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### 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)] - Add option to enable/disable notification on quick filtering MD5s. #2408 - Suggest disabling JSON Index if catalog.json is loading slowly. #2412 diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 131283b11..f1dba6cc9 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 36a94e94e..57f83976a 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.12.9 +// @version 1.14.12.10 // @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 b7af1cca8..288e46ee6 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.12.9 +// @version 1.14.12.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -219,7 +219,7 @@ docSet = function() { }; g = { - VERSION: '1.14.12.9', + VERSION: '1.14.12.10', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -14402,7 +14402,7 @@ Gallery = (function() { Gallery.generateThumb(this, file); 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)); } else { results.push(void 0); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 3f50a5c5b..a58228d8f 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 17e68a9d4..29bb43e58 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.12.9 +// @version 1.14.12.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -219,7 +219,7 @@ docSet = function() { }; g = { - VERSION: '1.14.12.9', + VERSION: '1.14.12.10', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -14402,7 +14402,7 @@ Gallery = (function() { Gallery.generateThumb(this, file); 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)); } else { results.push(void 0); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 5e674dbfa..f5f3d25d8 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 18ffeec51..e45b20c91 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.12.9 +// @version 1.14.12.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index dcfa39002..7e5597870 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.12.9 +// @version 1.14.12.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -219,7 +219,7 @@ docSet = function() { }; g = { - VERSION: '1.14.12.9', + VERSION: '1.14.12.10', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -14402,7 +14402,7 @@ Gallery = (function() { Gallery.generateThumb(this, file); 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)); } else { results.push(void 0); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 024b3ae18..ddf053062 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 5e37daa58..911453581 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.12.9", + "version": "1.14.12.10", "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 ad2b599ca..ce66f91e1 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 e43323f3c..42a8b11ed 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.12.9", + "version": "1.14.12.10", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index a70e3d629..020632501 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 74e61fb82..c8a306bed 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.12.9", - "date": "2019-08-22T22:12:16.150Z" + "version": "1.14.12.10", + "date": "2019-08-27T02:25:18.242Z" } \ No newline at end of file