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

3.5.346. Pass the modifier flag in from API emote sets. (Maybe just refactor how those emotes are treated entirely?) Fix emote duplication in the emote menu extension for people who use that.

Browse source
This commit is contained in:
SirStendec 2016-10-25 01:45:51 -04:00
parent 748c437a57
commit 5d3ba8778c
5 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ember/chat-input.js
View file

@ -332,7 +332,9 @@ FFZ.prototype.modify_chat_input = function(component) {
ffz_chatters: [],
ffz_init: function() {
f._inputv = this;
// We don't want to store references to conversation input handlers.
if ( ! ConvoInput || ! (this.parentView instanceof ConvoInput) )
f._inputv = this;
var s = this._ffz_minimal_style = document.createElement('style');
s.id = 'ffz-minimal-chat-textarea-height';

1
src/ext/api.js
View file

@ -209,6 +209,7 @@ API.prototype._load_set = function(real_id, set_id, data) {
new_emote.css = emote.css;
new_emote.margins = emote.margins;
new_emote.modifier = emote.modifier;
new_emote.srcSet = emote.urls[1] + ' 1x';
new_emote.urls[1] = emote.urls[1];

3
src/ext/emote_menu.js
View file

@ -30,6 +30,9 @@ FFZ.prototype.setup_emote_menu = function(delay) {
// --------------------
FFZ.prototype._emote_menu_enumerator = function() {
if ( this.has_bttv )
return [];
var twitch_user = this.get_user(),
user_id = twitch_user ? twitch_user.login : null,
controller = utils.ember_lookup('controller:chat'),

2
src/main.js
View file

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