diff --git a/CHANGELOG.md b/CHANGELOG.md index ef766399d..4b0284953 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.15.3 +*2014-12-08* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.3/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Fix sounds sometimes playing for a short time before `Disable Autoplaying Sounds` halts them (as in 1.9.14.4). + ### v1.9.15.2 *2014-12-08* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.15.2/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index b25e4bfde..53a7cc26e 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.15.2 +* 4chan X - Version 1.9.15.3 * * 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 e7d52a79a..1621d282f 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 8c53ccc9a..c3ef1d133 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.15.2 +// @version 1.9.15.3 // @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 34f903be8..a0b0ebcc9 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.15.2 +// @version 1.9.15.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.15.2 +* 4chan X - Version 1.9.15.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -390,7 +390,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.15.2', + VERSION: '1.9.15.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -12454,27 +12454,32 @@ AntiAutoplay = { init: function() { + var audio, _i, _len, _ref; if (!Conf['Disable Autoplaying Sounds']) { return; } - return $.ready(this.ready); - }, - ready: function() { - var audio, _i, _len, _ref, _results; - _ref = $$('audio[autoplay]'); - _results = []; + _ref = $$('audio[autoplay]', doc); for (_i = 0, _len = _ref.length; _i < _len; _i++) { audio = _ref[_i]; - audio.pause(); - audio.autoplay = false; - if (!audio.controls) { - audio.controls = true; - _results.push($.addClass(audio, 'controls-added')); - } else { - _results.push(void 0); - } + this.stop(audio); } - return _results; + return window.addEventListener('loadstart', ((function(_this) { + return function(e) { + return _this.stop(e.target); + }; + })(this)), true); + }, + stop: function(audio) { + if (!audio.autoplay) { + return; + } + audio.pause(); + audio.autoplay = false; + if (audio.controls) { + return; + } + audio.controls = true; + return $.addClass(audio, 'controls-added'); } }; @@ -14068,7 +14073,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 1493285b5..6ac8c9c59 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 43c4adc98..98b1815cc 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.15.2 +// @version 1.9.15.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.15.2 +* 4chan X - Version 1.9.15.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -389,7 +389,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.15.2', + VERSION: '1.9.15.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -12453,27 +12453,32 @@ AntiAutoplay = { init: function() { + var audio, _i, _len, _ref; if (!Conf['Disable Autoplaying Sounds']) { return; } - return $.ready(this.ready); - }, - ready: function() { - var audio, _i, _len, _ref, _results; - _ref = $$('audio[autoplay]'); - _results = []; + _ref = $$('audio[autoplay]', doc); for (_i = 0, _len = _ref.length; _i < _len; _i++) { audio = _ref[_i]; - audio.pause(); - audio.autoplay = false; - if (!audio.controls) { - audio.controls = true; - _results.push($.addClass(audio, 'controls-added')); - } else { - _results.push(void 0); - } + this.stop(audio); } - return _results; + return window.addEventListener('loadstart', ((function(_this) { + return function(e) { + return _this.stop(e.target); + }; + })(this)), true); + }, + stop: function(audio) { + if (!audio.autoplay) { + return; + } + audio.pause(); + audio.autoplay = false; + if (audio.controls) { + return; + } + audio.controls = true; + return $.addClass(audio, 'controls-added'); } }; @@ -14067,7 +14072,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 2d8bb3116..1a5f8ecec 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 c6a73be18..f5d480738 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.15.2 +// @version 1.9.15.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 432f3c114..c4cdbdb5b 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.15.2 +// @version 1.9.15.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.15.2 +* 4chan X - Version 1.9.15.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -390,7 +390,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.15.2', + VERSION: '1.9.15.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -12454,27 +12454,32 @@ AntiAutoplay = { init: function() { + var audio, _i, _len, _ref; if (!Conf['Disable Autoplaying Sounds']) { return; } - return $.ready(this.ready); - }, - ready: function() { - var audio, _i, _len, _ref, _results; - _ref = $$('audio[autoplay]'); - _results = []; + _ref = $$('audio[autoplay]', doc); for (_i = 0, _len = _ref.length; _i < _len; _i++) { audio = _ref[_i]; - audio.pause(); - audio.autoplay = false; - if (!audio.controls) { - audio.controls = true; - _results.push($.addClass(audio, 'controls-added')); - } else { - _results.push(void 0); - } + this.stop(audio); } - return _results; + return window.addEventListener('loadstart', ((function(_this) { + return function(e) { + return _this.stop(e.target); + }; + })(this)), true); + }, + stop: function(audio) { + if (!audio.autoplay) { + return; + } + audio.pause(); + audio.autoplay = false; + if (audio.controls) { + return; + } + audio.controls = true; + return $.addClass(audio, 'controls-added'); } }; @@ -14068,7 +14073,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 e4815fcb5..336aea481 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 f0b0479c8..c756040a0 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 2f29bb4f2..6f6afd578 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index e10b649a0..2d77b487b 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.15.2", + "version": "1.9.15.3", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",