Merge branch 'bbeta'

This commit is contained in:
ccd0 2015-02-01 18:43:50 -08:00
commit 36a95f5709
16 changed files with 43 additions and 43 deletions

View File

@ -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). 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.x --> <!-- v1.9.22.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 ### 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")] *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")]

View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.9.22.4 * 4chan X - Version 1.9.22.5
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.9.22.4 // @version 1.9.22.5
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.9.22.4 // @version 1.9.22.5
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -25,7 +25,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.9.22.4 * 4chan X - Version 1.9.22.5
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -401,7 +401,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.9.22.4', VERSION: '1.9.22.5',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
NAME: '4chan X', NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -4925,19 +4925,17 @@
}, },
archive: function() { archive: function() {
return $.ready(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'); _ref = $$('.name');
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
name = _ref[_i]; name = _ref[_i];
name.textContent = 'Anonymous'; name.textContent = 'Anonymous';
} }
_ref1 = $$('.postertrip'); _ref1 = $$('.postertrip');
_results = [];
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
trip = _ref1[_j]; trip = _ref1[_j];
_results.push($.rm(trip)); $.rm(trip);
} }
return _results;
}); });
} }
}; };
@ -9979,14 +9977,14 @@
if (el.muted || !$.hasAudio(el)) { if (el.muted || !$.hasAudio(el)) {
return; return;
} }
volume = el.volume; volume = el.volume + 0.1;
if (e.deltaY < 0) { if (e.deltaY < 0) {
volume += 0.1; volume *= 1.1;
} }
if (e.deltaY > 0) { 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(); return e.preventDefault();
} }
}; };

Binary file not shown.

View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.9.22.4 // @version 1.9.22.5
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -24,7 +24,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.9.22.4 * 4chan X - Version 1.9.22.5
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -400,7 +400,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.9.22.4', VERSION: '1.9.22.5',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
NAME: '4chan X', NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -4924,19 +4924,17 @@
}, },
archive: function() { archive: function() {
return $.ready(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'); _ref = $$('.name');
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
name = _ref[_i]; name = _ref[_i];
name.textContent = 'Anonymous'; name.textContent = 'Anonymous';
} }
_ref1 = $$('.postertrip'); _ref1 = $$('.postertrip');
_results = [];
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
trip = _ref1[_j]; trip = _ref1[_j];
_results.push($.rm(trip)); $.rm(trip);
} }
return _results;
}); });
} }
}; };
@ -9978,14 +9976,14 @@
if (el.muted || !$.hasAudio(el)) { if (el.muted || !$.hasAudio(el)) {
return; return;
} }
volume = el.volume; volume = el.volume + 0.1;
if (e.deltaY < 0) { if (e.deltaY < 0) {
volume += 0.1; volume *= 1.1;
} }
if (e.deltaY > 0) { 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(); return e.preventDefault();
} }
}; };

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.9.22.4 // @version 1.9.22.5
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.9.22.4 // @version 1.9.22.5
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -25,7 +25,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.9.22.4 * 4chan X - Version 1.9.22.5
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -401,7 +401,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.9.22.4', VERSION: '1.9.22.5',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
NAME: '4chan X', NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -4925,19 +4925,17 @@
}, },
archive: function() { archive: function() {
return $.ready(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'); _ref = $$('.name');
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
name = _ref[_i]; name = _ref[_i];
name.textContent = 'Anonymous'; name.textContent = 'Anonymous';
} }
_ref1 = $$('.postertrip'); _ref1 = $$('.postertrip');
_results = [];
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
trip = _ref1[_j]; trip = _ref1[_j];
_results.push($.rm(trip)); $.rm(trip);
} }
return _results;
}); });
} }
}; };
@ -9979,14 +9977,14 @@
if (el.muted || !$.hasAudio(el)) { if (el.muted || !$.hasAudio(el)) {
return; return;
} }
volume = el.volume; volume = el.volume + 0.1;
if (e.deltaY < 0) { if (e.deltaY < 0) {
volume += 0.1; volume *= 1.1;
} }
if (e.deltaY > 0) { 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(); return e.preventDefault();
} }
}; };

Binary file not shown.

View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.22.4' /> <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.22.5' />
</app> </app>
</gupdate> </gupdate>

View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.22.4' /> <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.22.5' />
</app> </app>
</gupdate> </gupdate>

View File

@ -3,7 +3,7 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": { "meta": {
"name": "4chan X", "name": "4chan X",
"version": "1.9.22.4", "version": "1.9.22.5",
"repo": "https://github.com/ccd0/4chan-x/", "repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x", "page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/", "downloads": "https://ccd0.github.io/4chan-x/builds/",

View File

@ -23,3 +23,4 @@ Anonymize =
$.ready -> $.ready ->
name.textContent = 'Anonymous' for name in $$ '.name' name.textContent = 'Anonymous' for name in $$ '.name'
$.rm trip for trip in $$ '.postertrip' $.rm trip for trip in $$ '.postertrip'
return

View File

@ -82,8 +82,8 @@ ImageHover =
wheel: (e) -> wheel: (e) ->
return unless el = $.id 'ihover' return unless el = $.id 'ihover'
return if el.muted or not $.hasAudio el return if el.muted or not $.hasAudio el
{volume} = el volume = el.volume + 0.1
volume += 0.1 if e.deltaY < 0 volume *= 1.1 if e.deltaY < 0
volume -= 0.1 if e.deltaY > 0 volume /= 1.1 if e.deltaY > 0
el.volume = $.minmax volume, 0, 1 el.volume = $.minmax volume - 0.1, 0, 1
e.preventDefault() e.preventDefault()