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.190. Minor CSS tweaks. Case insensitive emote tab completion. Fix the new sidebar in portrait mode.

Browse source
This commit is contained in:
SirStendec 2016-05-27 00:59:03 -04:00
parent 2cb07d6c78
commit 57a95986d3
5 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,6 +133,18 @@ FFZ.settings_info.input_complete_name_at = {
}
FFZ.settings_info.input_emoticons_case_sensitive = {
type: "boolean",
value: true,
category: "Chat Input",
no_bttv: true,
name: "Tab-Complete Emoticons Case Sensitive",
help: "When enabled, tab-completion for emoticons is case sensitive."
}
FFZ.settings_info.input_complete_without_prefix = {
type: "boolean",
value: true,
@ -169,7 +181,7 @@ FFZ.settings_info.input_emoji = {
FFZ.prototype.setup_chat_input = function() {
this.log("Hooking the Ember Chat Input component.");
var Input = utils.ember_resolve('component:twitch-chat-input'),
var Input = utils.ember_resolve('component:chat/twitch-chat-input'),
f = this;
if ( ! Input )
@ -698,7 +710,7 @@ FFZ.prototype._modify_chat_input = function(component) {
name = name.toLowerCase();
return char === '@' ? name.indexOf(part2.toLowerCase()) === 0 : name.indexOf(partial.toLowerCase()) === 0;
} else if ( type === 'emoji' ) {
} else if ( type === 'emoji' || ! f.settings.input_emoticons_case_sensitive ) {
name = name.toLowerCase();
return name.indexOf(partial.toLowerCase()) === 0;
}

7
src/ember/layout.js
View file

@ -262,8 +262,10 @@ FFZ.prototype.setup_layout = function() {
theatre_video_top = video_below ? theatre_chat_height : 0,
theatre_chat_top = video_below ? 0 : theatre_video_height;
out = 'body[data-current-path^="user."] #left_col,' +
out = 'body[data-current-path^="user."] #left_col .warp { min-height: inherit }' +
'body[data-current-path^="user."] #left_col { overflow: hidden }' +
'body[data-current-path^="user."] #left_col .warp,' +
'body[data-current-path^="user."] #left_col,' +
'body[data-current-path^="user."]:not(.ffz-sidebar-swap) #main_col{' +
'margin-right:0 !important;' +
'top:' + video_top + 'px;' +
@ -276,6 +278,7 @@ FFZ.prototype.setup_layout = function() {
'width:100%;' +
'top:' + chat_top + 'px;' +
'height:' + chat_height + 'px}' +
'body[data-current-path^="user."] .app-main.theatre #left_col .warp,' +
'body[data-current-path^="user."] .app-main.theatre #left_col,' +
'body[data-current-path^="user."] .app-main.theatre #main_col{' +
'top:' + theatre_video_top + 'px;' +

4
src/main.js
View file

@ -37,7 +37,7 @@ FFZ.msg_commands = {};
// Version
var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 188,
major: 3, minor: 5, revision: 190,
toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
}
@ -237,7 +237,7 @@ FFZ.prototype.initialize = function(increment, delay) {
}
// Check for special non-ember pages.
if ( /^\/(?:$|search$|user\/|p\/|settings|m\/|messages?\/)/.test(location.pathname) ) {
if ( /^\/(?:$|search$|team\/|user\/|p\/|settings|m\/|messages?\/)/.test(location.pathname) ) {
this.init_normal(delay);
return;
}