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

3.5.327. component:chat/chat-room-manager cometh.

Browse source
This commit is contained in:
SirStendec 2016-10-12 20:54:09 -04:00
parent 6ab4bd64a8
commit 4e2c2f5056
7 changed files with 62 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ui/my_emotes.js
View file

@ -97,7 +97,8 @@ FFZ.menu_pages.myemotes = {
has_sets: function(view) {
var user = this.get_user(),
tmi = view && view.get('controller.currentRoom.tmiSession'),
controller = utils.ember_lookup('controller:chat'),
tmi = controller && controller.get('currentRoom.tmiSession'),
ffz_sets = user && this.users[user.login] && this.users[user.login].sets || [],
twitch_sets = (tmi && tmi.getEmotes() || {'emoticon_sets': {}})['emoticon_sets'],
@ -180,7 +181,8 @@ FFZ.menu_pages.myemotes = {
},
render_lists: function(view, container, favorites_only) {
var tmi = view.get('controller.currentRoom.tmiSession'),
var controller = utils.ember_lookup('controller:chat'),
tmi = controller && controller.get('currentRoom.tmiSession'),
twitch_sets = (tmi && tmi.getEmotes() || {'emoticon_sets': {}})['emoticon_sets'],
user = this.get_user(),