paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

right-sidebar: Replace invite-link height with shortcut height.

Browse Source 
To calculate the max-height of buddy_list_wrapper, we use
invite-link-height. This works alright if inviting is enabled
for all. However for users who aren't permitted to invite,
the element does not render, hence the logic uses `0` as
default value for subtraction in `get_new_heights` function
under resize.js. This leads to the keyboard-shortcut icon
rendered below the browser window. Hence use the parent div
`right-sidebar-shortcuts` height for the logic.
This commit is contained in:
Gaurav Pandey
2021-05-10 21:35:35 +05:30
committed by Tim Abbott
parent 70244896e5
commit 756ee2c055
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/resize.js
View File

@@ -42,7 +42,7 @@ function get_new_heights() {
const res = {}; const res = {};
const viewport_height = message_viewport.height(); const viewport_height = message_viewport.height();
const top_navbar_height = $("#top_navbar").safeOuterHeight(true); const top_navbar_height = $("#top_navbar").safeOuterHeight(true);
const invite_user_link_height = $("#invite-user-link").safeOuterHeight(true) || 0; const right_sidebar_shorcuts_height = $(".right-sidebar-shortcuts").safeOuterHeight(true) || 0;
const add_streams_link_height = $("#add-stream-link").safeOuterHeight(true) || 0; const add_streams_link_height = $("#add-stream-link").safeOuterHeight(true) || 0;
res.bottom_whitespace_height = viewport_height * 0.4; res.bottom_whitespace_height = viewport_height * 0.4;
@@ -68,7 +68,7 @@ function get_new_heights() {
Number.parseInt($("#right-sidebar").css("marginTop"), 10) - Number.parseInt($("#right-sidebar").css("marginTop"), 10) -
$("#userlist-header").safeOuterHeight(true) - $("#userlist-header").safeOuterHeight(true) -
$("#user_search_section").safeOuterHeight(true) - $("#user_search_section").safeOuterHeight(true) -
invite_user_link_height; right_sidebar_shorcuts_height;
res.buddy_list_wrapper_max_height = Math.max(80, usable_height); res.buddy_list_wrapper_max_height = Math.max(80, usable_height);