From 991d85cae2a8caaa1605f928f1a4a5fd35f98696 Mon Sep 17 00:00:00 2001 From: pichalite Date: Tue, 23 Feb 2016 20:30:25 +0000 Subject: [PATCH] account for search input when calculating recent list height on expanded chats --- public/src/client/chats.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/src/client/chats.js b/public/src/client/chats.js index f56dcf6d33..58e5afe904 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -411,10 +411,13 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll', if (messagesList.length) { var margin = $('.expanded-chat ul').outerHeight(true) - $('.expanded-chat ul').height(), inputHeight = $('.chat-input').outerHeight(true), - fromTop = messagesList.offset().top; + fromTop = messagesList.offset().top, + searchHeight = $('.chat-search').height(), + searchListHeight = $('[component="chat/search/list"]').outerHeight(true) - $('[component="chat/search/list"]').height(); messagesList.height($(window).height() - (fromTop + inputHeight + (margin * 4))); - components.get('chat/recent').height($('.expanded-chat').height()); + components.get('chat/recent').height($('.expanded-chat').height() - (searchHeight + searchListHeight)); + $('[component="chat/search/list"]').css('max-height', components.get('chat/recent').height()/2 + 'px'); } Chats.setActive();