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

Rough support for the updated BetterTTV. It's kind of messy, so I'll investigate a better way to hook into it with less chance of breaking.

Browse source 
Other minor changes.
This commit is contained in:
SirStendec 2015-03-30 00:52:18 -04:00
parent a0ab653e8f
commit 216a82aa5a
10 changed files with 205 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ui/my_emotes.js
View file

@ -187,7 +187,7 @@ FFZ.menu_pages.my_emotes = {
if ( ! set.channel )
set.channel = name;
dn();
}.bind(this,set,name,dn), 5000);
}.bind(this,set,name,dn), 2000);
}.bind(this, set, lname, name)));
},
handle_promises = function() {
@ -229,7 +229,7 @@ FFZ.menu_pages.my_emotes = {
setTimeout(function() {
if ( needed_sets.length )
handle_promises();
}, 5000);
}, 2000);
} else
handle_promises();
@ -315,7 +315,7 @@ FFZ.menu_pages.my_emotes = {
if ( set.id === "global" )
title = "Global Emoticons";
else
title = set.id;
title = set.title || set.id;
badge = set.icon || "http://cdn.frankerfacez.com/channel/global/devicon.png";