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

3.5.182. I forgot to commit a bit again. D: Removed FFZ from two-factor auth dialogs / pages. Added option to always expand the player volume slider. Revamped ban notices to be nicer. Status indicator for emoteonly-mode. Fixed /ffz reload command. Update to the latest FileSaver.js. Make high contrast compatible with BTTV. Conversations fixes. Better BTTV dark theme detection.

Browse source
This commit is contained in:
SirStendec 2016-05-20 17:30:34 -04:00
parent 6cf5ddc734
commit 4af0c3480c
19 changed files with 378 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/badges.js
View file

@ -414,7 +414,8 @@ FFZ.prototype.load_badges = function(callback, tries) {
jQuery.getJSON(constants.API_SERVER + "v1/badges")
.done(function(data) {
var badge_total = 0,
badge_count = 0;
badge_count = 0,
badge_data = {};
for(var i=0; i < data.badges.length; i++) {
var badge = data.badges[i];
@ -430,6 +431,8 @@ FFZ.prototype.load_badges = function(callback, tries) {
var badge = f.badges[badge_id],
users = data.users[badge_id];
badge_data[badge.name] = users.length;
for(var i=0; i < users.length; i++) {
var user = users[i],
ud = f.users[user] = f.users[user] || {},
@ -451,7 +454,7 @@ FFZ.prototype.load_badges = function(callback, tries) {
f.log("Loaded " + utils.number_commas(badge_count) + " total badges across " + badge_total + " types.");
typeof callback === "function" && callback(true);
typeof callback === "function" && callback(true, badge_count, badge_total, badge_data);
}).fail(function(data) {
if ( data.status === 404 )