diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8a80420..37e7eec83 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ 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.22.4 +*2015-02-01* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.4/builds/4chan-X-noupdate.crx "Chromium version")] + +- Fix bugs in syncing of mute/volume settings between tabs. + ### v1.9.22.3 *2015-02-01* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.3/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index bf6d37999..a02b5d132 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.22.3 +* 4chan X - Version 1.9.22.4 * * 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 5a1b6b17e..1df1092ae 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 0bef16eb7..7fa5b9fad 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.22.3 +// @version 1.9.22.4 // @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 25f71b529..9816cc6e4 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.22.3 +// @version 1.9.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.3 +* 4chan X - Version 1.9.22.4 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -401,7 +401,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.3', + VERSION: '1.9.22.4', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10255,7 +10255,20 @@ Volume = { init: function() { var unmuteEntry, volumeEntry, _ref, _ref1; - if (!(((_ref = g.BOARD.ID) === 'gif' || _ref === 'wsg') && ((_ref1 = g.VIEW) === 'index' || _ref1 === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + return; + } + $.sync('Allow Sound', function(x) { + var _ref1; + Conf['Allow Sound'] = x; + return (_ref1 = Volume.inputs) != null ? _ref1.unmute.checked = x : void 0; + }); + $.sync('Default Volume', function(x) { + var _ref1; + Conf['Default Volume'] = x; + return (_ref1 = Volume.inputs) != null ? _ref1.volume.value = x : void 0; + }); + if ((_ref1 = g.BOARD.ID) !== 'gif' && _ref1 !== 'wsg') { return; } unmuteEntry = UI.checkbox('Allow Sound', ' Allow Sound'); @@ -10272,12 +10285,6 @@ }; $.on(this.inputs.unmute, 'change', $.cb.checked); $.on(this.inputs.volume, 'change', $.cb.value); - $.sync('Allow Sound', function(x) { - return Volume.inputs.unmute.checked = x; - }); - $.sync('Default Volume', function(x) { - return Volume.inputs.volume.value = x; - }); Header.menu.addEntry({ el: unmuteEntry, order: 200 diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index c45d2a294..257f7e0ee 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 fa3cdc88a..44ce4f72c 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.22.3 +// @version 1.9.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.3 +* 4chan X - Version 1.9.22.4 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -400,7 +400,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.3', + VERSION: '1.9.22.4', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10254,7 +10254,20 @@ Volume = { init: function() { var unmuteEntry, volumeEntry, _ref, _ref1; - if (!(((_ref = g.BOARD.ID) === 'gif' || _ref === 'wsg') && ((_ref1 = g.VIEW) === 'index' || _ref1 === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + return; + } + $.sync('Allow Sound', function(x) { + var _ref1; + Conf['Allow Sound'] = x; + return (_ref1 = Volume.inputs) != null ? _ref1.unmute.checked = x : void 0; + }); + $.sync('Default Volume', function(x) { + var _ref1; + Conf['Default Volume'] = x; + return (_ref1 = Volume.inputs) != null ? _ref1.volume.value = x : void 0; + }); + if ((_ref1 = g.BOARD.ID) !== 'gif' && _ref1 !== 'wsg') { return; } unmuteEntry = UI.checkbox('Allow Sound', ' Allow Sound'); @@ -10271,12 +10284,6 @@ }; $.on(this.inputs.unmute, 'change', $.cb.checked); $.on(this.inputs.volume, 'change', $.cb.value); - $.sync('Allow Sound', function(x) { - return Volume.inputs.unmute.checked = x; - }); - $.sync('Default Volume', function(x) { - return Volume.inputs.volume.value = x; - }); Header.menu.addEntry({ el: unmuteEntry, order: 200 diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 6cfdea204..4d3cd5939 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 e1676abb3..809d29570 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.22.3 +// @version 1.9.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 53059cfb4..f699b536a 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.22.3 +// @version 1.9.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.3 +* 4chan X - Version 1.9.22.4 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -401,7 +401,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.22.3', + VERSION: '1.9.22.4', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -10255,7 +10255,20 @@ Volume = { init: function() { var unmuteEntry, volumeEntry, _ref, _ref1; - if (!(((_ref = g.BOARD.ID) === 'gif' || _ref === 'wsg') && ((_ref1 = g.VIEW) === 'index' || _ref1 === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + if (!(((_ref = g.VIEW) === 'index' || _ref === 'thread') && (Conf['Image Expansion'] || Conf['Image Hover'] || Conf['Gallery']))) { + return; + } + $.sync('Allow Sound', function(x) { + var _ref1; + Conf['Allow Sound'] = x; + return (_ref1 = Volume.inputs) != null ? _ref1.unmute.checked = x : void 0; + }); + $.sync('Default Volume', function(x) { + var _ref1; + Conf['Default Volume'] = x; + return (_ref1 = Volume.inputs) != null ? _ref1.volume.value = x : void 0; + }); + if ((_ref1 = g.BOARD.ID) !== 'gif' && _ref1 !== 'wsg') { return; } unmuteEntry = UI.checkbox('Allow Sound', ' Allow Sound'); @@ -10272,12 +10285,6 @@ }; $.on(this.inputs.unmute, 'change', $.cb.checked); $.on(this.inputs.volume, 'change', $.cb.value); - $.sync('Allow Sound', function(x) { - return Volume.inputs.unmute.checked = x; - }); - $.sync('Default Volume', function(x) { - return Volume.inputs.volume.value = x; - }); Header.menu.addEntry({ el: unmuteEntry, order: 200 diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 5f6663f60..9a87bb5d1 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 169655118..f0528a370 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 1c66d0817..933590ac9 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 80f9d35d0..e38a87bb1 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.22.3", + "version": "1.9.22.4", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",