diff --git a/CHANGELOG.md b/CHANGELOG.md index 550c7340a..84c66a154 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda ### v1.10.6 +**v1.10.6.1** *(2015-03-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.1/builds/4chan-X-noupdate.crx "Chromium version")] +- Fix conflict with 4chan imgur thumbnail script. + **v1.10.6.0** *(2015-03-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.0/builds/4chan-X-noupdate.crx "Chromium version")] - Based on v1.10.5.3. - Add workaround for pasting images to the Quick Reply in Firefox. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index c8607a3bd..222b38040 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 8e7e1ef13..78bb5e0bc 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.10.6.0 +// @version 1.10.6.1 // @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 387c56d05..7c9850fdf 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.10.6.0 +// @version 1.10.6.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.6.0', + VERSION: '1.10.6.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -1350,6 +1350,9 @@ } fileText = fileEl.firstElementChild; link = $('a', fileText); + if (link.host !== 'i.4cdn.org') { + return; + } info = link.nextSibling.textContent; this.file = { text: fileText, diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index bb9bdf174..a3f244886 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 5e17b727d..f67268c9f 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.10.6.0 +// @version 1.10.6.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -394,7 +394,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.6.0', + VERSION: '1.10.6.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -1349,6 +1349,9 @@ } fileText = fileEl.firstElementChild; link = $('a', fileText); + if (link.host !== 'i.4cdn.org') { + return; + } info = link.nextSibling.textContent; this.file = { text: fileText, diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 60f24ee05..496610150 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 16f380587..4826201a1 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.6.0 +// @version 1.10.6.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index fabbb6383..0210c422c 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.10.6.0 +// @version 1.10.6.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.6.0', + VERSION: '1.10.6.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -1350,6 +1350,9 @@ } fileText = fileEl.firstElementChild; link = $('a', fileText); + if (link.host !== 'i.4cdn.org') { + return; + } info = link.nextSibling.textContent; this.file = { text: fileText, diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 6c79a2401..889b09c43 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 750414ebe..d41e582f3 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 1f6413ff7..6840b92ed 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index a2724bf9f..bf97dea81 100755 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.10.6.0", - "date": "2015-03-22T11:55:08.762Z", + "version": "1.10.6.1", + "date": "2015-03-22T23:41:08.690Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",