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.472. Add new Verified badge. Add separate transparent image support for badges. Misc. minor bug fixes.

Browse source
This commit is contained in:
SirStendec 2017-04-22 22:34:22 -04:00
parent e2803a7e1d
commit efaf46ee75
13 changed files with 183 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ui/my_emotes.js
View file

@ -213,16 +213,18 @@ FFZ.menu_pages.myemotes = {
if ( ! set.length )
continue;
var raw_id = this._twitch_set_to_channel[set_id],
menu_id = raw_id ? raw_id.toLowerCase() : 'unknown';
if ( this._twitch_inventory_sets.indexOf(set_id) !== -1 ) {
for(var i=0; i < set.length; i++)
if ( ! favorites_only || gathered_favorites.indexOf(set[i].id) !== -1 )
gathered_emotes.push(set[i]);
if ( set.length === 1 && ! raw_id ) {
if ( ! favorites_only || gathered_favorites.indexOf(set[0].id) !== -1 )
gathered_emotes.push(set[0]);
continue;
}
var favorites_list = this.settings.favorite_emotes["twitch-" + set_id];
var raw_id = this._twitch_set_to_channel[set_id],
menu_id = raw_id ? raw_id.toLowerCase() : 'unknown',
favorites_list = this.settings.favorite_emotes["twitch-" + set_id];
if ( favorites_only && (! favorites_list || ! favorites_list.length) )
continue;