Fix chatbox growth

pull/7629/head
Diego Sampaio 8 years ago
parent 00fd6a8bf3
commit 0916f9a993
No known key found for this signature in database
GPG Key ID: E060152B30502562
  1. 23
      packages/rocketchat-theme/client/imports/base.css
  2. 14
      packages/rocketchat-ui/client/lib/chatMessages.js
  3. 5
      packages/rocketchat-ui/client/views/app/room.js

@ -1568,11 +1568,8 @@ label.required::after {
flex-flow: row nowrap; flex-flow: row nowrap;
padding: 0 10px 0 20px; padding: 0 10px 0 20px;
border-width: 0 0 1px; border-width: 0 0 1px;
z-index: 100;
top: 0;
left: 0;
width: 100%;
height: calc(var(--header-min-height) + 1px); height: calc(var(--header-min-height) + 1px);
flex-shrink: 0;
&.visible h2 { &.visible h2 {
overflow: visible; overflow: visible;
@ -2130,15 +2127,14 @@ label.required::after {
.messages-container { .messages-container {
position: relative; position: relative;
height: 100%; flex: 1;
width: 100%; display: flex;
top: 0; flex-direction: column;
left: 0;
z-index: 1;
&-wrapper { &-wrapper {
height: 100%; height: 100%;
display: flex; display: flex;
flex-grow: 1;
} }
&-main { &-main {
@ -2175,12 +2171,7 @@ label.required::after {
& .footer { & .footer {
padding: 8px 20px 0; padding: 8px 20px 0;
border-width: 1px 0 0; border-width: 1px 0 0;
z-index: 100; flex-shrink: 0;
bottom: 0;
left: 0;
width: 100%;
min-height: var(--footer-min-height);
height: 130px;
} }
& .message-form { & .message-form {
@ -2534,7 +2525,6 @@ label.required::after {
.messages-box { .messages-box {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
width: 100%;
flex-grow: 1; flex-grow: 1;
& .message-cog-container .message-action.jump-to-search-message { & .message-cog-container .message-action.jump-to-search-message {
@ -3273,7 +3263,6 @@ body:not(.is-cordova) {
&.opened .flex-tab { &.opened .flex-tab {
display: block; display: block;
height: calc(100% - 61px); /* --header-height */
} }
} }

@ -13,13 +13,6 @@ this.ChatMessages = class ChatMessages {
this.bindEvents(); this.bindEvents();
} }
resize() {
let dif = (RocketChat.Layout.isEmbedded() ? 0 : 60) + $('.messages-container').find('footer').outerHeight();
dif += $('.announcement').length > 0 ? 40 : 0;
return $('.messages-box').css({
height: `calc(100% - ${ dif }px)`});
}
getEditingIndex(element) { getEditingIndex(element) {
const msgs = this.wrapper.get(0).querySelectorAll('.own:not(.system)'); const msgs = this.wrapper.get(0).querySelectorAll('.own:not(.system)');
let index = 0; let index = 0;
@ -361,11 +354,7 @@ this.ChatMessages = class ChatMessages {
bindEvents() { bindEvents() {
if (this.wrapper && this.wrapper.length) { if (this.wrapper && this.wrapper.length) {
return $('.input-message').autogrow({ $('.input-message').autogrow();
postGrowCallback: () => {
return this.resize();
}
});
} }
} }
@ -416,7 +405,6 @@ this.ChatMessages = class ChatMessages {
const input = event.currentTarget; const input = event.currentTarget;
// const $input = $(input); // const $input = $(input);
const k = event.which; const k = event.which;
this.resize(input);
if (k === 13) { if (k === 13) {
if (sendOnEnter == null || sendOnEnter === 'normal' || sendOnEnter === 'desktop' && Meteor.Device.isDesktop()) { if (sendOnEnter == null || sendOnEnter === 'normal' || sendOnEnter === 'desktop' && Meteor.Device.isDesktop()) {

@ -175,11 +175,6 @@ Template.room.helpers({
showAnnouncement() { showAnnouncement() {
const roomData = Session.get(`roomData${ this._id }`); const roomData = Session.get(`roomData${ this._id }`);
if (!roomData) { return false; } if (!roomData) { return false; }
Meteor.defer(() => {
if (window.chatMessages && window.chatMessages[roomData._id]) {
return window.chatMessages[roomData._id].resize();
}
});
return (roomData.announcement !== undefined) && (roomData.announcement !== ''); return (roomData.announcement !== undefined) && (roomData.announcement !== '');
}, },

Loading…
Cancel
Save