oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-10 08:10:52 +00:00
Code Wiki Activity

Bunch o changes. I'm a bad person.

Browse source
This commit is contained in:
SirStendec 2015-06-05 03:59:28 -04:00
parent 576c9569b2
commit 6264da62fc
25 changed files with 4610 additions and 1860 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ext/emote_menu.js
View file

@ -38,14 +38,14 @@ FFZ.prototype._emote_menu_enumerator = function() {
for(var x = 0; x < sets.length; x++) {
var set = this.emote_sets[sets[x]];
if ( ! set || ! set.emotes )
if ( ! set || ! set.emoticons )
continue;
for(var emote_id in set.emotes) {
if ( ! set.emotes.hasOwnProperty(emote_id) )
for(var emote_id in set.emoticons) {
if ( ! set.emoticons.hasOwnProperty(emote_id) )
continue;
var emote = set.emotes[emote_id];
var emote = set.emoticons[emote_id];
if ( emote.hidden )
continue;
@ -66,7 +66,7 @@ FFZ.prototype._emote_menu_enumerator = function() {
} else
title = "FrankerFaceZ: " + title;
emotes.push({text: emote.name, url: emote.url,
emotes.push({text: emote.name, url: emote.urls[1],
hidden: false, channel: title, badge: badge});
}
}