oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-03 00:18:31 +00:00
Code Wiki Activity

3.5.418. Bunch of changes made while I was away at AGDQ. Add a setting for using the mouse wheel to adjust player volume. Fix colors in vod chat when Twitch adds non-messages as messages. (CLEARCHAT go home you're drunk...)

Browse source
This commit is contained in:
SirStendec 2017-01-18 18:33:56 -05:00
parent 6b13ac3265
commit 03c825c398
13 changed files with 465 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tokenize.js
View file

@ -213,7 +213,10 @@ FFZ.prototype.setup_tokenization = function() {
this.error("Unable to get bits tokenizer.", err);
}
bits_service = utils.ember_lookup('service:bits-rendering-config');
bits_service = utils.ember_lookup('service:bits-emotes');
if ( ! bits_service )
bits_service = utils.ember_lookup('service:bits-rendering-config');
bits_tags = utils.ember_lookup('service:bits-tags');
try {
@ -388,7 +391,7 @@ FFZ.prototype.render_tooltip = function(el) {
out = utils.number_commas(amount) + ' Bit' + utils.pluralize(amount);
if ( f.settings.emote_image_hover )
preview_url = bits_service.ffz_get_preview(tier[1]);
preview_url = bits_service.ffz_get_preview(prefix, amount); //tier[1]);
if ( individuals && individuals.length > 1 ) {
out += '<br>';