diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f9d5809..24d3f6eaf 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor 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.5 +*2015-02-01* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.22.5/builds/4chan-X-noupdate.crx "Chromium version")] + +- Make scroll wheel volume adjustments finer at low volumes. + ### 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")] diff --git a/LICENSE b/LICENSE index a02b5d132..e83c6ca93 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.22.4 +* 4chan X - Version 1.9.22.5 * * 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 1df1092ae..6580c7609 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 7fa5b9fad..5efd74bf9 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.4 +// @version 1.9.22.5 // @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 9816cc6e4..77465d77e 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.4 +// @version 1.9.22.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.4 +* 4chan X - Version 1.9.22.5 * * 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.4', + VERSION: '1.9.22.5', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -4925,19 +4925,17 @@ }, archive: function() { return $.ready(function() { - var name, trip, _i, _j, _len, _len1, _ref, _ref1, _results; + var name, trip, _i, _j, _len, _len1, _ref, _ref1; _ref = $$('.name'); for (_i = 0, _len = _ref.length; _i < _len; _i++) { name = _ref[_i]; name.textContent = 'Anonymous'; } _ref1 = $$('.postertrip'); - _results = []; for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { trip = _ref1[_j]; - _results.push($.rm(trip)); + $.rm(trip); } - return _results; }); } }; @@ -9979,14 +9977,14 @@ if (el.muted || !$.hasAudio(el)) { return; } - volume = el.volume; + volume = el.volume + 0.1; if (e.deltaY < 0) { - volume += 0.1; + volume *= 1.1; } if (e.deltaY > 0) { - volume -= 0.1; + volume /= 1.1; } - el.volume = $.minmax(volume, 0, 1); + el.volume = $.minmax(volume - 0.1, 0, 1); return e.preventDefault(); } }; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 257f7e0ee..489af5a76 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 44ce4f72c..99958a2bc 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.4 +// @version 1.9.22.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.4 +* 4chan X - Version 1.9.22.5 * * 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.4', + VERSION: '1.9.22.5', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -4924,19 +4924,17 @@ }, archive: function() { return $.ready(function() { - var name, trip, _i, _j, _len, _len1, _ref, _ref1, _results; + var name, trip, _i, _j, _len, _len1, _ref, _ref1; _ref = $$('.name'); for (_i = 0, _len = _ref.length; _i < _len; _i++) { name = _ref[_i]; name.textContent = 'Anonymous'; } _ref1 = $$('.postertrip'); - _results = []; for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { trip = _ref1[_j]; - _results.push($.rm(trip)); + $.rm(trip); } - return _results; }); } }; @@ -9978,14 +9976,14 @@ if (el.muted || !$.hasAudio(el)) { return; } - volume = el.volume; + volume = el.volume + 0.1; if (e.deltaY < 0) { - volume += 0.1; + volume *= 1.1; } if (e.deltaY > 0) { - volume -= 0.1; + volume /= 1.1; } - el.volume = $.minmax(volume, 0, 1); + el.volume = $.minmax(volume - 0.1, 0, 1); return e.preventDefault(); } }; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 4d3cd5939..b4e8fdde1 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 809d29570..af201cea1 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.4 +// @version 1.9.22.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index f699b536a..5f64335c2 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.4 +// @version 1.9.22.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.22.4 +* 4chan X - Version 1.9.22.5 * * 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.4', + VERSION: '1.9.22.5', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -4925,19 +4925,17 @@ }, archive: function() { return $.ready(function() { - var name, trip, _i, _j, _len, _len1, _ref, _ref1, _results; + var name, trip, _i, _j, _len, _len1, _ref, _ref1; _ref = $$('.name'); for (_i = 0, _len = _ref.length; _i < _len; _i++) { name = _ref[_i]; name.textContent = 'Anonymous'; } _ref1 = $$('.postertrip'); - _results = []; for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { trip = _ref1[_j]; - _results.push($.rm(trip)); + $.rm(trip); } - return _results; }); } }; @@ -9979,14 +9977,14 @@ if (el.muted || !$.hasAudio(el)) { return; } - volume = el.volume; + volume = el.volume + 0.1; if (e.deltaY < 0) { - volume += 0.1; + volume *= 1.1; } if (e.deltaY > 0) { - volume -= 0.1; + volume /= 1.1; } - el.volume = $.minmax(volume, 0, 1); + el.volume = $.minmax(volume - 0.1, 0, 1); return e.preventDefault(); } }; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 9a87bb5d1..9d34705b6 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 f0528a370..5a89eae71 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 933590ac9..252239ebf 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index e38a87bb1..629f8ce69 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.4", + "version": "1.9.22.5", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/", diff --git a/src/Filtering/Anonymize.coffee b/src/Filtering/Anonymize.coffee index c34821a7a..2a3c211a4 100755 --- a/src/Filtering/Anonymize.coffee +++ b/src/Filtering/Anonymize.coffee @@ -23,3 +23,4 @@ Anonymize = $.ready -> name.textContent = 'Anonymous' for name in $$ '.name' $.rm trip for trip in $$ '.postertrip' + return diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee index b26db6d48..b3588df09 100755 --- a/src/Images/ImageHover.coffee +++ b/src/Images/ImageHover.coffee @@ -82,8 +82,8 @@ ImageHover = wheel: (e) -> return unless el = $.id 'ihover' return if el.muted or not $.hasAudio el - {volume} = el - volume += 0.1 if e.deltaY < 0 - volume -= 0.1 if e.deltaY > 0 - el.volume = $.minmax volume, 0, 1 + volume = el.volume + 0.1 + volume *= 1.1 if e.deltaY < 0 + volume /= 1.1 if e.deltaY > 0 + el.volume = $.minmax volume - 0.1, 0, 1 e.preventDefault()