1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-25 20:18:31 +00:00

3.5.315. Emote tab completion for whisper windows. Transparent Colored badges. Dynamically generate Twitch badge CSS. CSS tweaks. Fix a bug where the chat settings menu wouldn't be hooked properly and modernized it. Closes #27. Closes #26. Closes #24.

This commit is contained in:
SirStendec 2016-10-05 23:07:10 -04:00
parent 21e823a15c
commit 7e24fa6c0e
16 changed files with 320 additions and 243 deletions

View file

@ -219,7 +219,9 @@ FFZ.prototype.setup_chat_input = function() {
FFZ.prototype.modify_chat_input = function(component) {
var f = this;
var f = this,
ConvoInput = utils.ember_resolve('component:twitch-conversations/conversation-input');
utils.ember_reopen_view(component, {
ffz_mru_index: -1,
ffz_current_suggestion: 0,
@ -507,7 +509,7 @@ FFZ.prototype.modify_chat_input = function(component) {
ffzFetchNameSuggestions: function() {
if ( ! this.get('ffz_suggestions_visible') )
this.set('ffz_name_suggestions', this.get('suggestions')());
this.set('ffz_name_suggestions', this.get('suggestions')() || []);
}.observes('suggestions'),
@ -553,9 +555,10 @@ FFZ.prototype.modify_chat_input = function(component) {
ffz_emoticons: function() {
var emotes = {},
room = this.get('parentView.context.model'),
in_conversation = ConvoInput && this.parentView instanceof ConvoInput,
room = ! in_conversation && this.get('parentView.context.model'),
room_id = room && room.get('id'),
tmi = room && room.tmiSession,
tmi = in_conversation ? window.TMI && TMI._sessions && TMI._sessions[0] : room && room.tmiSession,
set_name, replacement, url, is_sub_set, fav_list,
emote_set, emote, emote_id, code,
@ -585,6 +588,8 @@ FFZ.prototype.modify_chat_input = function(component) {
set_name = 'Twitch Global';
else if ( set_name === '--twitch-turbo--' || set_name === 'turbo' || set_name === '--turbo-faces--' )
set_name = 'Twitch Turbo';
else if ( set_name === 'prime' || set_name === '--prime-faces--' )
set_name = 'Twitch Prime';
else {
set_name = 'Channel: ' + FFZ.get_capitalization(set_name);
is_sub_set = true;