diff --git a/CHANGELOG.md b/CHANGELOG.md index b619896fc..7e66601b1 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.7.1 +*2014-10-13* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.1/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Escape parameters correctly in `javascript:` sauce links. + ### v1.9.7.0 *2014-10-12* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.0/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index f4ba024e7..f64da90b8 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.7.0 +* 4chan X - Version 1.9.7.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 807ed87a4..8be35bd3f 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 70465987a..53f2e2ff1 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.7.0 +// @version 1.9.7.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 a717b5851..2b0264d62 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.7.0 +// @version 1.9.7.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.7.0 +* 4chan X - Version 1.9.7.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -381,7 +381,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.7.0', + VERSION: '1.9.7.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -9413,16 +9413,18 @@ '%TURL': post.file.thumbURL, '%URL': post.file.URL, '%MD5': post.file.MD5, - '%board': post.board, + '%board': post.board.ID, '%name': post.file.name, '%%': '%', '%semi': ';' }[parameter]; if (key === 'url' && parameter !== '%%' && parameter !== '%semi') { - return encodeURIComponent(type); - } else { - return type; + if (/^javascript:/i.test(parts['url'])) { + type = JSON.stringify(type); + } + type = encodeURIComponent(type); } + return type; }); } ext = ((_ref2 = post.file.URL.match(/\.([^\.]*)$/)) != null ? _ref2[1] : void 0) || ''; @@ -9435,6 +9437,9 @@ a = Sauce.link.cloneNode(true); a.href = parts['url']; a.textContent = parts['text']; + if (/^javascript:/i.test(parts['url'])) { + a.removeAttribute('target'); + } return a; }, node: function() { @@ -13536,7 +13541,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 997dac0e4..b492da5f1 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 88a7d9c15..3786e1c44 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.7.0 +// @version 1.9.7.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.7.0 +* 4chan X - Version 1.9.7.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -380,7 +380,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.7.0', + VERSION: '1.9.7.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -9412,16 +9412,18 @@ '%TURL': post.file.thumbURL, '%URL': post.file.URL, '%MD5': post.file.MD5, - '%board': post.board, + '%board': post.board.ID, '%name': post.file.name, '%%': '%', '%semi': ';' }[parameter]; if (key === 'url' && parameter !== '%%' && parameter !== '%semi') { - return encodeURIComponent(type); - } else { - return type; + if (/^javascript:/i.test(parts['url'])) { + type = JSON.stringify(type); + } + type = encodeURIComponent(type); } + return type; }); } ext = ((_ref2 = post.file.URL.match(/\.([^\.]*)$/)) != null ? _ref2[1] : void 0) || ''; @@ -9434,6 +9436,9 @@ a = Sauce.link.cloneNode(true); a.href = parts['url']; a.textContent = parts['text']; + if (/^javascript:/i.test(parts['url'])) { + a.removeAttribute('target'); + } return a; }, node: function() { @@ -13535,7 +13540,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 9706a3b94..9dff5e97d 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 4708b3a7f..91ca2b2da 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.7.0 +// @version 1.9.7.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index f9e55942f..730c5a1f0 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.7.0 +// @version 1.9.7.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.7.0 +* 4chan X - Version 1.9.7.1 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -381,7 +381,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.7.0', + VERSION: '1.9.7.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -9413,16 +9413,18 @@ '%TURL': post.file.thumbURL, '%URL': post.file.URL, '%MD5': post.file.MD5, - '%board': post.board, + '%board': post.board.ID, '%name': post.file.name, '%%': '%', '%semi': ';' }[parameter]; if (key === 'url' && parameter !== '%%' && parameter !== '%semi') { - return encodeURIComponent(type); - } else { - return type; + if (/^javascript:/i.test(parts['url'])) { + type = JSON.stringify(type); + } + type = encodeURIComponent(type); } + return type; }); } ext = ((_ref2 = post.file.URL.match(/\.([^\.]*)$/)) != null ? _ref2[1] : void 0) || ''; @@ -9435,6 +9437,9 @@ a = Sauce.link.cloneNode(true); a.href = parts['url']; a.textContent = parts['text']; + if (/^javascript:/i.test(parts['url'])) { + a.removeAttribute('target'); + } return a; }, node: function() { @@ -13536,7 +13541,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 c5b0e08d6..b62651dd0 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 647ed1b9c..2164fc6e5 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 fe1b0d263..575db2ed3 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 3f09dc3d8..edaf3db65 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.7.0", + "version": "1.9.7.1", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",