oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-04 18:18:31 +00:00
Code Wiki Activity

3.5.148. Fix tokenize_emotes not using hasOwnProperty to check if a key exists in an object, causing some words to get eaten in chat on Firefox.

Browse source
This commit is contained in:
SirStendec 2016-03-27 02:15:32 -04:00
parent 46dee22d83
commit 5bb64a0904
6 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,18 @@ FFZ.settings_info.input_complete_emotes = {
}
FFZ.settings_info.input_complete_name_at = {
type: "boolean",
value: true,
category: "Chat Input",
no_bttv: true,
name: "Tab-Complete Usernames with At Sign",
help: "When enabled, tab-completed usernames will have an @ sign before them if you typed one. This is default Twitch behavior, but unnecessary."
}
FFZ.settings_info.input_complete_without_prefix = {
type: "boolean",
value: true,
@ -160,12 +172,17 @@ FFZ.prototype.setup_chat_input = function() {
this._modify_chat_input(Input);
try { Input.create().destroy()
} catch(err) { }
var views = utils.ember_views();
for(var key in views) {
var v = views[key];
if ( v instanceof Input ) {
this.log("Manually modifying Chat Input component.", v);
this._modify_chat_input(v);
if ( ! v.ffzInit )
this._modify_chat_input(v);
v.ffzInit();
}
}
@ -439,8 +456,9 @@ FFZ.prototype._modify_chat_input = function(component) {
ind = this.get('ffz_partial_word_start'),
text = this.get('textareaValue'),
content = (item.command_content && text.charAt(0) === '/' ?
item.command_content : item.content) || item.label,
content = ((f.settings.input_complete_name_at && item.type === 'user' && this.get('ffz_partial_word').charAt(0) === '@') ? '@' : '') +
((item.command_content && text.charAt(0) === '/' ?
item.command_content : item.content) || item.label),
trail = text.substr(ind + this.get('ffz_partial_word').length),
prefix = text.substr(0, ind) + content + (trail ? '' : ' ');
@ -931,10 +949,10 @@ FFZ.prototype._modify_chat_input = function(component) {
}
}
});
break;
}
break;
case KEYCODES.ENTER:
if ( e.shiftKey || e.shiftLeft )