diff --git a/CHANGELOG.md b/CHANGELOG.md index 77ceec94c..8c3d3dffc 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.12 +**v1.11.12.4** *(2015-10-09)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.4/builds/4chan-X-noupdate.crx "Chromium version")] +- Exclude Twitch from auto-embedding due to autoplay bug. + **v1.11.12.3** *(2015-10-08)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.3/builds/4chan-X-noupdate.crx "Chromium version")] - Merge v1.11.11.8: (bakugo, MayhemYDG) Update archive list: arch.b4k.co updates and new archive archive.poweredby.moe. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 57a2a4495..87ab098b2 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 9b414ca2f..6b79e76bd 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.11.12.3 +// @version 1.11.12.4 // @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 382b3790d..ac367cab0 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.11.12.3 +// @version 1.11.12.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -413,7 +413,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.12.3', + VERSION: '1.11.12.4', NAMESPACE: '4chan X.', boards: {} }; @@ -11658,7 +11658,7 @@ } $.on(embed, 'click', Embedding.cb.toggle); $.after(link, [$.tn(' '), embed]); - if (Conf['Auto-embed'] && !Conf['Floating Embeds'] && !post.isFetchedQuote) { + if (Conf['Auto-embed'] && !Conf['Floating Embeds'] && !post.isFetchedQuote && key !== 'TwitchTV') { return $.asap((function() { return doc.contains(embed); }), function() { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 39c035d3d..0918e7142 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 071fd0bf2..095d42865 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.12.3 +// @version 1.11.12.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -413,7 +413,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.12.3', + VERSION: '1.11.12.4', NAMESPACE: '4chan X.', boards: {} }; @@ -11658,7 +11658,7 @@ } $.on(embed, 'click', Embedding.cb.toggle); $.after(link, [$.tn(' '), embed]); - if (Conf['Auto-embed'] && !Conf['Floating Embeds'] && !post.isFetchedQuote) { + if (Conf['Auto-embed'] && !Conf['Floating Embeds'] && !post.isFetchedQuote && key !== 'TwitchTV') { return $.asap((function() { return doc.contains(embed); }), function() { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 959580b43..82323fae6 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 991c01c19..81fa2ad34 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.12.3 +// @version 1.11.12.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 01558a69d..d1d355297 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.12.3 +// @version 1.11.12.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -413,7 +413,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.12.3', + VERSION: '1.11.12.4', NAMESPACE: '4chan X.', boards: {} }; @@ -11658,7 +11658,7 @@ } $.on(embed, 'click', Embedding.cb.toggle); $.after(link, [$.tn(' '), embed]); - if (Conf['Auto-embed'] && !Conf['Floating Embeds'] && !post.isFetchedQuote) { + if (Conf['Auto-embed'] && !Conf['Floating Embeds'] && !post.isFetchedQuote && key !== 'TwitchTV') { return $.asap((function() { return doc.contains(embed); }), function() { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 5dca01d14..d5a7009e9 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 4ebdf5e9b..4bda59836 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 92b5f98aa..263cb91d2 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 43290ec8f..0955d962a 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "meta": { "name": "4chan X", "fork": "ccd0", - "version": "1.11.12.3", - "date": "2015-10-09T01:08:32.268Z", + "version": "1.11.12.4", + "date": "2015-10-10T05:15:57.466Z", "page": "https://www.4chan-x.net/", "downloads": "https://www.4chan-x.net/builds/", "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",