diff --git a/CHANGELOG.md b/CHANGELOG.md index a0e67b12d..ec0d0fd1a 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.7.56 +*2014-06-12* + **ccd0** - Chromium now follows Firefox's policy on the download attribute and requires the same workaround for downloading with the original filename. https://crbug.com/373182#c24 diff --git a/LICENSE b/LICENSE index 8f7ac0981..0e8b076e3 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.7.55 - 2014-06-11 +* 4chan X - Version 1.7.56 - 2014-06-12 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index ab240581e..452046286 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.7.55 +// @version 1.7.56 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 5d0d2bcf2..cd71b8a8b 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.7.55 +// @version 1.7.56 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.7.55 - 2014-06-11 +* 4chan X - Version 1.7.56 - 2014-06-12 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -374,7 +374,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.55', + VERSION: '1.7.56', NAMESPACE: '4chan X.', boards: {} }; @@ -9354,24 +9354,22 @@ className: 'download-link', textContent: 'Download file' }); - if (typeof chrome === "undefined" || chrome === null) { - $.on(a, 'click', function(e) { - if (this.protocol === 'blob:') { - return true; - } - e.preventDefault(); - return CrossOrigin.request(this.href, (function(_this) { - return function(blob) { - if (blob) { - _this.href = URL.createObjectURL(blob); - return _this.click(); - } else { - return new Notice('error', "Could not download " + file.URL, 30); - } - }; - })(this)); - }); - } + $.on(a, 'click', function(e) { + if (this.protocol === 'blob:') { + return true; + } + e.preventDefault(); + return CrossOrigin.request(this.href, (function(_this) { + return function(blob) { + if (blob) { + _this.href = URL.createObjectURL(blob); + return _this.click(); + } else { + return new Notice('error', "Could not download " + file.URL, 30); + } + }; + })(this)); + }); return $.event('AddMenuEntry', { type: 'post', el: a, @@ -12487,7 +12485,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13332,7 +13330,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.55.' + innerHTML: '4chan X has been updated to version 1.7.56.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 0d86fc9bb..2a339baa3 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/crx.crx b/builds/crx.crx index 6f5e2f70c..1464958fa 100644 Binary files a/builds/crx.crx and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 60e2aaf74..616b6befc 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.55", + "version": "1.7.56", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index e74e2e003..91ed9625d 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.55 - 2014-06-11 +* 4chan X - Version 1.7.56 - 2014-06-12 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -349,7 +349,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.55', + VERSION: '1.7.56', NAMESPACE: '4chan X.', boards: {} }; @@ -9349,6 +9349,22 @@ className: 'download-link', textContent: 'Download file' }); + $.on(a, 'click', function(e) { + if (this.protocol === 'blob:') { + return true; + } + e.preventDefault(); + return CrossOrigin.request(this.href, (function(_this) { + return function(blob) { + if (blob) { + _this.href = URL.createObjectURL(blob); + return _this.click(); + } else { + return new Notice('error', "Could not download " + file.URL, 30); + } + }; + })(this)); + }); return $.event('AddMenuEntry', { type: 'post', el: a, @@ -12463,7 +12479,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13295,7 +13311,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.55.' + innerHTML: '4chan X has been updated to version 1.7.56.' }); new Notice('info', el, 15); } else { diff --git a/builds/updates.xml b/builds/updates.xml index 06fb5be3e..90716eba8 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/wcrx/manifest.json b/builds/wcrx/manifest.json index b492d76d3..a0dab69c0 100644 --- a/builds/wcrx/manifest.json +++ b/builds/wcrx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.55", + "version": "1.7.56", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/wcrx/script.js b/builds/wcrx/script.js index e74e2e003..91ed9625d 100644 --- a/builds/wcrx/script.js +++ b/builds/wcrx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.55 - 2014-06-11 +* 4chan X - Version 1.7.56 - 2014-06-12 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -349,7 +349,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.55', + VERSION: '1.7.56', NAMESPACE: '4chan X.', boards: {} }; @@ -9349,6 +9349,22 @@ className: 'download-link', textContent: 'Download file' }); + $.on(a, 'click', function(e) { + if (this.protocol === 'blob:') { + return true; + } + e.preventDefault(); + return CrossOrigin.request(this.href, (function(_this) { + return function(blob) { + if (blob) { + _this.href = URL.createObjectURL(blob); + return _this.click(); + } else { + return new Notice('error', "Could not download " + file.URL, 30); + } + }; + })(this)); + }); return $.event('AddMenuEntry', { type: 'post', el: a, @@ -12463,7 +12479,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13295,7 +13311,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.55.' + innerHTML: '4chan X has been updated to version 1.7.56.' }); new Notice('info', el, 15); } else { diff --git a/package.json b/package.json index 0190940a0..fc37f3ec0 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.7.55", + "version": "1.7.56", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",