diff --git a/static/js/popovers.js b/static/js/popovers.js index 9e4d968285..9448420e07 100644 --- a/static/js/popovers.js +++ b/static/js/popovers.js @@ -816,8 +816,8 @@ export function register_click_handlers() { const user_id = elem_to_user_id($(e.target).parents("ul")); const email = people.get_by_user_id(user_id).email; hide_all(); - if (overlays.settings_open()) { - overlays.close_overlay("settings"); + if (overlays.is_active()) { + overlays.close_active(); } narrow.by("pm-with", email, {trigger: "user sidebar popover"}); e.stopPropagation(); @@ -828,8 +828,8 @@ export function register_click_handlers() { const user_id = elem_to_user_id($(e.target).parents("ul")); const email = people.get_by_user_id(user_id).email; hide_all(); - if (overlays.settings_open()) { - overlays.close_overlay("settings"); + if (overlays.is_active()) { + overlays.close_active(); } narrow.by("sender", email, {trigger: "user sidebar popover"}); e.stopPropagation(); @@ -1055,8 +1055,8 @@ export function register_click_handlers() { private_message_recipient: email, }); hide_all(); - if (overlays.settings_open()) { - overlays.close_overlay("settings"); + if (overlays.is_active()) { + overlays.close_active(); } e.stopPropagation(); e.preventDefault(); diff --git a/static/templates/stream_settings/stream_member_list_entry.hbs b/static/templates/stream_settings/stream_member_list_entry.hbs index 20bccc5325..5cee339a1a 100644 --- a/static/templates/stream_settings/stream_member_list_entry.hbs +++ b/static/templates/stream_settings/stream_member_list_entry.hbs @@ -1,6 +1,7 @@ - {{name}}{{#if is_current_user}} {{t "(you)"}}{{/if}} + {{name}} + {{#if is_current_user}} {{t "(you)"}}{{/if}} {{#if show_email}} {{email}}