From a2df5f18e9277f157f178da691735183cf15652a Mon Sep 17 00:00:00 2001
From: Steve Howell <steve@zulip.com>
Date: Wed, 13 Nov 2013 11:28:49 -0500
Subject: [PATCH] Add expectOne() checks for sidebar logic.

(imported from commit b9e729fd37f291d9e3f17edf77117d71fd129f7c)
---
 static/js/ui.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/static/js/ui.js b/static/js/ui.js
index 941908448a..3383171c2e 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -429,18 +429,22 @@ exports.resize_page_components = function () {
     tab_bar_under.width(desired_width);
 
     var h;
+    var sidebar;
 
     if (viewport.width() < 975 && feature_flags.left_side_userlist && !narrow_window) {
         narrow_window = true;
         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");
         $("#userlist-toggle").css("display", "none");
     }
     else if (viewport.width() > 975 && feature_flags.left_side_userlist && narrow_window) {
         narrow_window = false;
         popovers.set_userlist_placement("right");
-        $("#right-sidebar").append($("#user-list"));
+        sidebar = $("#right-sidebar").expectOne();
+        sidebar.append($("#user-list").expectOne());
         $("#user_presences").css("margin", '');
         $("#userlist-toggle").css("display", '');
     }