oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-05 10:38:30 +00:00
Code Wiki Activity

3.5.320. Fix a bunch of stuff. Remove auto-pause hosts because Twitch made it impossible to implement to the best of my knowledge. Closes #34. Closes #32. Closes #23. Closes #21. Closes #10.

Browse source
This commit is contained in:
SirStendec 2016-10-11 21:41:35 -04:00
parent 9ddfabb1b1
commit dca6f0f103
13 changed files with 243 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tokenize.js
View file

@ -315,7 +315,7 @@ FFZ.prototype.format_display_name = function(display_name, user_id, disable_alia
display_name = utils.sanitize(display_name || (user_id && user_id.capitalize()));
if ( ! disable_intl && setting === 3 && ! name_matches )
display_name += disable_html ? '(' + user_id + ')' : ' <span class="intl-login">(' + user_id + ')</span>';
display_name += disable_html ? ' (' + user_id + ')' : ' <span class="intl-login">(' + user_id + ')</span>';
else if ( ((disable_intl && setting === 3) || setting === 4) && ! name_matches )
tooltip = user_id;
@ -456,6 +456,9 @@ FFZ.prototype.render_tooltip = function(el) {
} else if ( emote_set === "--twitch-turbo--" || emote_set === "turbo" || emote_set === "--turbo-faces--" ) {
emote_set = "Twitch Turbo";
set_type = null;
} else if ( emote_set === '--prime--' || emote_set === '--prime-faces--' ) {
emote_set = "Twitch Prime";
set_type = null;
}
if ( this.classList.contains('ffz-tooltip-no-credit') )