diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eaa335b2..3d23b8166 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x). +### v1.9.16.1 +*2014-12-14* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.16.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.16.1/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Merged from v1.9.15.20: Bugfixes. + ### v1.9.16.0 *2014-12-13* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.16.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.16.0/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index d27ca1cb7..72beefa51 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.16.0 +* 4chan X - Version 1.9.16.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 63ec33345..22ae3c52d 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 95eac3120..2c6f505c5 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.9.16.0 +// @version 1.9.16.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 b2d25b5ae..8c4c43c38 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.9.16.0 +// @version 1.9.16.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.16.0 +* 4chan X - Version 1.9.16.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -393,7 +393,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.16.0', + VERSION: '1.9.16.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10494,7 +10494,7 @@ } } if (!embed) { - return div.textContent = "ERROR: Not a valid filetype"; + return el.textContent = "ERROR: Not a valid filetype"; } switch (embed.type) { case 'video/mp4': @@ -10991,7 +10991,7 @@ _this.href = URL.createObjectURL(blob); return _this.click(); } else { - return new Notice('error', "Could not download " + file.URL, 30); + return new Notice('error', "Could not download " + _this.href, 30); } }; })(this)); @@ -14472,7 +14472,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index d37191d9e..20272fb3f 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 1cea231bc..051fa8801 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.9.16.0 +// @version 1.9.16.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.16.0 +* 4chan X - Version 1.9.16.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -392,7 +392,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.16.0', + VERSION: '1.9.16.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10493,7 +10493,7 @@ } } if (!embed) { - return div.textContent = "ERROR: Not a valid filetype"; + return el.textContent = "ERROR: Not a valid filetype"; } switch (embed.type) { case 'video/mp4': @@ -10990,7 +10990,7 @@ _this.href = URL.createObjectURL(blob); return _this.click(); } else { - return new Notice('error', "Could not download " + file.URL, 30); + return new Notice('error', "Could not download " + _this.href, 30); } }; })(this)); @@ -14471,7 +14471,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 860943f2d..f3d651e4c 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 754b5d9b8..807e0fa45 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.16.0 +// @version 1.9.16.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index d4f940171..67ba55c10 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.9.16.0 +// @version 1.9.16.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.16.0 +* 4chan X - Version 1.9.16.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -393,7 +393,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.16.0', + VERSION: '1.9.16.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10494,7 +10494,7 @@ } } if (!embed) { - return div.textContent = "ERROR: Not a valid filetype"; + return el.textContent = "ERROR: Not a valid filetype"; } switch (embed.type) { case 'video/mp4': @@ -10991,7 +10991,7 @@ _this.href = URL.createObjectURL(blob); return _this.click(); } else { - return new Notice('error', "Could not download " + file.URL, 30); + return new Notice('error', "Could not download " + _this.href, 30); } }; })(this)); @@ -14472,7 +14472,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 0b1558cd6..0e790af02 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 fedb735e9..4b4bd2276 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 7b99cf2b7..8192d7239 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 21b0476f9..1867ea784 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.9.16.0", + "version": "1.9.16.1", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/", @@ -70,4 +70,4 @@ "engines": { "node": ">=0.10" } -} +} \ No newline at end of file