oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-16 18:06:55 +00:00
Code Wiki Activity

3.5.360. Move twitch_emotes.json. CSS tweaks. Fix hosting layout.

Browse source
This commit is contained in:
SirStendec 2016-10-31 23:51:03 -04:00
parent d472993aa3
commit c8a7d65732
7 changed files with 61 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/ember/sidebar.js
View file

@ -2,7 +2,7 @@ var FFZ = window.FrankerFaceZ,
utils = require('../utils'),
constants = require('../constants'),
PRESENCE_SERVICE = 'service:ember-twitch-presence@presence',
PRESENCE_SERVICE = 'service:twitch-presence/presence',
was_invisible = false;
@ -10,7 +10,7 @@ var FFZ = window.FrankerFaceZ,
// Settings
// --------------------
FFZ.settings_info.sidebar_followed_games = {
/*FFZ.settings_info.sidebar_followed_games = {
type: "select",
options: {
0: "Disabled",
@ -33,7 +33,7 @@ FFZ.settings_info.sidebar_followed_games = {
if ( controller )
controller.set('ffz_sidebar_games', val);
}
};
};*/
FFZ.settings_info.sidebar_hide_recommended_channels = {
@ -74,7 +74,7 @@ FFZ.settings_info.sidebar_hide_prime = {
};
FFZ.settings_info.sidebar_hide_promoted_games = {
/*FFZ.settings_info.sidebar_hide_promoted_games = {
type: "boolean",
value: false,
@ -85,7 +85,7 @@ FFZ.settings_info.sidebar_hide_promoted_games = {
help: "Hide the Promoted Games section from the sidebar.",
on_update: utils.toggle_cls('ffz-hide-promoted-games')
};
};*/
@ -158,9 +158,9 @@ FFZ.settings_info.sidebar_disable_friends = {
var presence = utils.ember_lookup(PRESENCE_SERVICE);
if ( presence ) {
if ( val )
presence.setInvisible && presence.setInvisible();
presence.setVisibility('none');
else if ( ! was_invisible )
presence.setOnline && presence.setOnline();
presence.setVisibility('full');
}
}
};
@ -196,7 +196,7 @@ FFZ.settings_info.sidebar_directly_to_followed_channels = {
FFZ.prototype.setup_sidebar = function() {
// CSS to Hide Stuff
utils.toggle_cls('ffz-hide-promoted-games')(this.settings.sidebar_hide_promoted_games);
//utils.toggle_cls('ffz-hide-promoted-games')(this.settings.sidebar_hide_promoted_games);
utils.toggle_cls('ffz-hide-recommended-channels')(this.settings.sidebar_hide_recommended_channels);
utils.toggle_cls('ffz-hide-recommended-friends')(this.settings.sidebar_hide_recommended_friends);
utils.toggle_cls('ffz-hide-friends-collapsed')(this.settings.sidebar_hide_friends_collapsed);
@ -210,16 +210,15 @@ FFZ.prototype.setup_sidebar = function() {
var presence = utils.ember_lookup(PRESENCE_SERVICE);
if ( presence ) {
was_invisible = presence.get('isInvisible') || false;
presence.setInvisible && presence.setInvisible();
presence.setVisibility('none');
}
} catch(err) {
window.dumberror = err;
this.error("Setting Friends Visibility", err);
}
}
// Sidebar Followed Games
var f = this,
/*var f = this,
GamesFollowing = utils.ember_lookup('controller:games-following');
if ( GamesFollowing ) {
@ -237,7 +236,7 @@ FFZ.prototype.setup_sidebar = function() {
Ember.propertyDidChange(GamesFollowing, 'sidePanelFollowing');
} else
this.error("Unable to load the Ember games-following controller.", null);
this.error("Unable to load the Ember games-following controller.", null);*/
// Navigation Component

2
src/main.js
View file

@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
// Version
var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 358,
major: 3, minor: 5, revision: 360,
toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
}

2
src/tokenize.js
View file

@ -337,7 +337,7 @@ FFZ.prototype.format_display_name = function(display_name, user_id, disable_alia
// ---------------------
FFZ.prototype.load_twitch_emote_data = function(tries) {
jQuery.ajax(constants.SERVER + "script/twitch_emotes.json", {context: this})
jQuery.ajax(constants.SERVER + "twitch_emotes.json", {context: this})
.done(function(data) {
for(var set_id in data) {
var set = data[set_id];