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

3.5.319. More logviewer integration. Notes work now. Clean up colored badges a bit more. Fix for incorrect player height. Modify chat lines the new, improved way. Load user <-> emote set mappings from the API. Fix legacy badges not showing correctly. Remove negative margins from chat lines. Add a line saying a sub is a Twitch Prime sub to the FFZ menu. Dark theme CSS tweaks.

Browse source
This commit is contained in:
SirStendec 2016-10-07 18:11:05 -04:00
parent d02f87528d
commit 9ddfabb1b1
16 changed files with 723 additions and 581 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/emoticons.js
View file

@ -301,6 +301,9 @@ FFZ.prototype.load_global_sets = function(callback, tries) {
gs.push(key);
f._load_set_json(key, undefined, set);
}
f._load_set_users(data.users);
}).fail(function(data) {
if ( data.status == 404 )
return typeof callback == "function" && callback(false);
@ -315,11 +318,33 @@ FFZ.prototype.load_global_sets = function(callback, tries) {
}
FFZ.prototype._load_set_users = function(data) {
if ( data )
for(var set_id in data)
if ( data.hasOwnProperty(set_id) ) {
var emote_set = this.emote_sets[set_id],
users = data[set_id];
for(var i=0; i < users.length; i++) {
var user = users[i],
ud = this.users[user] = this.users[user] || {},
sets = ud.sets = ud.sets || [];
if ( sets.indexOf(set_id) === -1 )
sets.push(set_id);
}
this.log('Added "' + (emote_set ? emote_set.title : set_id) + '" emote set to ' + utils.number_commas(users.length) + ' users.');
}
}
FFZ.prototype.load_set = function(set_id, callback, tries) {
var f = this;
jQuery.getJSON(constants.API_SERVER + "v1/set/" + set_id)
.done(function(data) {
f._load_set_json(set_id, callback, data && data.set);
f._load_set_users(data.users);
}).fail(function(data) {
if ( data.status == 404 )