diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c3425827..f39a4367f 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.1 +**v1.10.1.7** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.7/builds/4chan-X-noupdate.crx "Chromium version")] +- Fix `Mouse Wheel Volume` in cross-board quotes (broken in v1.10.1.1). + **v1.10.1.6** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.6/builds/4chan-X-noupdate.crx "Chromium version")] - Reduce writes to storage a bit more. diff --git a/LICENSE b/LICENSE index c3b25a48d..df80ac396 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.10.1.6 +* 4chan X - Version 1.10.1.7 * * 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 e208034a7..416b94276 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 61ce63333..bf29559fc 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.1.6 +// @version 1.10.1.7 // @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 6520a7443..5a2ce9b78 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.1.6 +// @version 1.10.1.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.1.6 +* 4chan X - Version 1.10.1.7 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +405,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.1.6', + VERSION: '1.10.1.7', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10471,9 +10471,21 @@ Conf['Default Volume'] = x; return (_ref1 = Volume.inputs) != null ? _ref1.volume.value = x : void 0; }); + if (Conf['Mouse Wheel Volume']) { + Post.callbacks.push({ + name: 'Mouse Wheel Volume', + cb: this.node + }); + } if ((_ref1 = g.BOARD.ID) !== 'gif' && _ref1 !== 'wsg') { return; } + if (Conf['Mouse Wheel Volume']) { + CatalogThread.callbacks.push({ + name: 'Mouse Wheel Volume', + cb: this.catalogNode + }); + } unmuteEntry = UI.checkbox('Allow Sound', 'Allow Sound'); unmuteEntry.title = Config.main['Images and Videos']['Allow Sound'][1]; volumeEntry = $.el('label', { @@ -10492,20 +10504,10 @@ el: unmuteEntry, order: 200 }); - Header.menu.addEntry({ + return Header.menu.addEntry({ el: volumeEntry, order: 201 }); - if (Conf['Mouse Wheel Volume']) { - Post.callbacks.push({ - name: 'Mouse Wheel Volume', - cb: this.node - }); - return CatalogThread.callbacks.push({ - name: 'Mouse Wheel Volume', - cb: this.catalogNode - }); - } }, setup: function(video) { video.muted = !Conf['Allow Sound']; @@ -10533,8 +10535,8 @@ } }, node: function() { - var _ref; - if (!((_ref = this.file) != null ? _ref.isVideo : void 0)) { + var _ref, _ref1; + if (!(((_ref = this.board.ID) === 'gif' || _ref === 'wsg') && ((_ref1 = this.file) != null ? _ref1.isVideo : void 0))) { return; } $.on(this.file.thumb, 'wheel', Volume.wheel.bind(Header.hover)); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index c2ba6f843..ecbee8802 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 d5b2e7486..60fcca9e0 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.1.6 +// @version 1.10.1.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.1.6 +* 4chan X - Version 1.10.1.7 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -404,7 +404,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.1.6', + VERSION: '1.10.1.7', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10470,9 +10470,21 @@ Conf['Default Volume'] = x; return (_ref1 = Volume.inputs) != null ? _ref1.volume.value = x : void 0; }); + if (Conf['Mouse Wheel Volume']) { + Post.callbacks.push({ + name: 'Mouse Wheel Volume', + cb: this.node + }); + } if ((_ref1 = g.BOARD.ID) !== 'gif' && _ref1 !== 'wsg') { return; } + if (Conf['Mouse Wheel Volume']) { + CatalogThread.callbacks.push({ + name: 'Mouse Wheel Volume', + cb: this.catalogNode + }); + } unmuteEntry = UI.checkbox('Allow Sound', 'Allow Sound'); unmuteEntry.title = Config.main['Images and Videos']['Allow Sound'][1]; volumeEntry = $.el('label', { @@ -10491,20 +10503,10 @@ el: unmuteEntry, order: 200 }); - Header.menu.addEntry({ + return Header.menu.addEntry({ el: volumeEntry, order: 201 }); - if (Conf['Mouse Wheel Volume']) { - Post.callbacks.push({ - name: 'Mouse Wheel Volume', - cb: this.node - }); - return CatalogThread.callbacks.push({ - name: 'Mouse Wheel Volume', - cb: this.catalogNode - }); - } }, setup: function(video) { video.muted = !Conf['Allow Sound']; @@ -10532,8 +10534,8 @@ } }, node: function() { - var _ref; - if (!((_ref = this.file) != null ? _ref.isVideo : void 0)) { + var _ref, _ref1; + if (!(((_ref = this.board.ID) === 'gif' || _ref === 'wsg') && ((_ref1 = this.file) != null ? _ref1.isVideo : void 0))) { return; } $.on(this.file.thumb, 'wheel', Volume.wheel.bind(Header.hover)); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 33605b83c..bc5443377 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 f0b46b4b4..b32136aae 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.1.6 +// @version 1.10.1.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index e2c5572ec..cc5003ad9 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.1.6 +// @version 1.10.1.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.1.6 +* 4chan X - Version 1.10.1.7 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +405,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.1.6', + VERSION: '1.10.1.7', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10471,9 +10471,21 @@ Conf['Default Volume'] = x; return (_ref1 = Volume.inputs) != null ? _ref1.volume.value = x : void 0; }); + if (Conf['Mouse Wheel Volume']) { + Post.callbacks.push({ + name: 'Mouse Wheel Volume', + cb: this.node + }); + } if ((_ref1 = g.BOARD.ID) !== 'gif' && _ref1 !== 'wsg') { return; } + if (Conf['Mouse Wheel Volume']) { + CatalogThread.callbacks.push({ + name: 'Mouse Wheel Volume', + cb: this.catalogNode + }); + } unmuteEntry = UI.checkbox('Allow Sound', 'Allow Sound'); unmuteEntry.title = Config.main['Images and Videos']['Allow Sound'][1]; volumeEntry = $.el('label', { @@ -10492,20 +10504,10 @@ el: unmuteEntry, order: 200 }); - Header.menu.addEntry({ + return Header.menu.addEntry({ el: volumeEntry, order: 201 }); - if (Conf['Mouse Wheel Volume']) { - Post.callbacks.push({ - name: 'Mouse Wheel Volume', - cb: this.node - }); - return CatalogThread.callbacks.push({ - name: 'Mouse Wheel Volume', - cb: this.catalogNode - }); - } }, setup: function(video) { video.muted = !Conf['Allow Sound']; @@ -10533,8 +10535,8 @@ } }, node: function() { - var _ref; - if (!((_ref = this.file) != null ? _ref.isVideo : void 0)) { + var _ref, _ref1; + if (!(((_ref = this.board.ID) === 'gif' || _ref === 'wsg') && ((_ref1 = this.file) != null ? _ref1.isVideo : void 0))) { return; } $.on(this.file.thumb, 'wheel', Volume.wheel.bind(Header.hover)); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index ef269bf3c..79702a657 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 590b85b8a..c1ac0e7d1 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 7a73751cd..fbd1162a3 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 612b50113..932063e65 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.10.1.6", + "version": "1.10.1.7", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",