oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-06 06:10:54 +00:00
Code Wiki Activity

Re-factored chat rendering. Lots of other stuff. Still don't remember to commit frequently like I should. :(

Browse source
This commit is contained in:
SirStendec 2015-07-29 01:03:10 -04:00
parent 02b0a95bd0
commit c5f55bd6b8
22 changed files with 2875 additions and 1433 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ui/my_emotes.js
View file

@ -112,6 +112,8 @@ FFZ.menu_pages.my_emotes = {
for(var set_id in twitch_sets)
if ( f._twitch_set_to_channel[set_id] )
ts[set_id] = twitch_sets[set_id];
else
ts[set_id] = "twitch_unknown";
return FFZ.menu_pages.my_emotes.draw_menu.bind(f)(view, container, ts);
};
@ -161,6 +163,7 @@ FFZ.menu_pages.my_emotes = {
heading.className = 'heading';
heading.innerHTML = '<span class="right">FrankerFaceZ</span>Emoji';
heading.style.backgroundImage = 'url("' + constants.SERVER + '/emoji/1f4af-1x.png")';
menu.className = 'emoticon-grid collapsable';
menu.appendChild(heading);
@ -212,7 +215,9 @@ FFZ.menu_pages.my_emotes = {
channel_id = this._twitch_set_to_channel[set_id], title;
if ( channel_id === "global" )
if ( channel_id === "twitch_unknown" )
title = "Unknown Channel";
else if ( channel_id === "global" )
title = "Global Emoticons";
else if ( channel_id === "turbo" || channel_id === "turbo_faces" )
title = "Twitch Turbo";