paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 20:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add expectOne() checks for sidebar logic.

Browse Source 
(imported from commit b9e729fd37f291d9e3f17edf77117d71fd129f7c)
This commit is contained in:
Steve Howell
2013-11-13 11:28:49 -05:00
parent 8511538c46
commit a2df5f18e9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/ui.js
View File

@@ -429,18 +429,22 @@ exports.resize_page_components = function () {
tab_bar_under.width(desired_width); tab_bar_under.width(desired_width);
var h; var h;
var sidebar;
if (viewport.width() < 975 && feature_flags.left_side_userlist && !narrow_window) { if (viewport.width() < 975 && feature_flags.left_side_userlist && !narrow_window) {
narrow_window = true; narrow_window = true;
popovers.set_userlist_placement("left"); popovers.set_userlist_placement("left");
$(".bottom_sidebar").append($("#user-list")).append($("#share-the-love")); sidebar = $(".bottom_sidebar").expectOne();
sidebar.append($("#user-list").expectOne());
sidebar.append($("#share-the-love").expectOne());
$("#user_presences").css("margin", "0px"); $("#user_presences").css("margin", "0px");
$("#userlist-toggle").css("display", "none"); $("#userlist-toggle").css("display", "none");
} }
else if (viewport.width() > 975 && feature_flags.left_side_userlist && narrow_window) { else if (viewport.width() > 975 && feature_flags.left_side_userlist && narrow_window) {
narrow_window = false; narrow_window = false;
popovers.set_userlist_placement("right"); popovers.set_userlist_placement("right");
$("#right-sidebar").append($("#user-list")); sidebar = $("#right-sidebar").expectOne();
sidebar.append($("#user-list").expectOne());
$("#user_presences").css("margin", ''); $("#user_presences").css("margin", '');
$("#userlist-toggle").css("display", ''); $("#userlist-toggle").css("display", '');
} }