oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-12 17:10:54 +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

15
src/featurefriday.js
View file

@ -91,10 +91,7 @@ FFZ.prototype._load_ff = function(data) {
if ( this.feature_friday ) {
// Remove the global set, delete the data, and reset the UI link.
this.global_sets.removeObject(this.feature_friday.set);
var set = this.emote_sets[this.feature_friday.set];
if ( set )
set.global = false;
this.default_sets.removeObject(this.feature_friday.set);
this.feature_friday = null;
this.update_ui_link();
@ -111,7 +108,8 @@ FFZ.prototype._load_ff = function(data) {
// Add the set.
this.global_sets.push(data.set);
this.load_set(data.set, this._update_ff_set.bind(this));
this.default_sets.push(data.set);
this.load_set(data.set);
// Check to see if the channel is live.
this._update_ff_live();
@ -134,13 +132,6 @@ FFZ.prototype._update_ff_live = function() {
}
FFZ.prototype._update_ff_set = function(success, set) {
// Prevent the set from being unloaded.
if ( set )
set.global = true;
}
FFZ.prototype._update_ff_name = function(name) {
if ( this.feature_friday )
this.feature_friday.display_name = name;