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

3.5.271 to 3.5.284. As usual, I only remember to commit when someone mentions it.

Browse source
This commit is contained in:
SirStendec 2016-09-09 17:34:20 -04:00
parent 9592dc1c2c
commit 8db999a8a8
29 changed files with 1388 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/settings.js
View file

@ -67,6 +67,9 @@ FFZ.prototype.load_settings = function() {
this.settings.del = this._setting_del.bind(this);
this.settings.load = this._setting_load.bind(this);
this.settings.get_twitch = this._setting_get_twitch.bind(this);
var found_settings = false;
for(var key in FFZ.settings_info) {
@ -811,6 +814,11 @@ FFZ.prototype._setting_get = function(key) {
return this.settings[key];
}
FFZ.prototype._setting_get_twitch = function(key) {
var Settings = utils.ember_lookup('controller:settings');
return Settings && Settings.get('settings.' + key);
}
FFZ.prototype._setting_set = function(key, val, suppress_log) {
var info = FFZ.settings_info[key],