paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_groups: Update ID of overlay container element.

Browse Source 
This commit renames ID of the container element of group
settings overlay to group_overlay_container. We also
rename the variables used for this element. This makes
it consistent with the container element of settings overlay.
This commit is contained in:
Sahil Batra
2023-04-18 08:18:39 +05:30
committed by Tim Abbott
parent a5580264eb
commit c27ff12b8c
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/app/index.html
View File

@@ -107,7 +107,7 @@
</div> </div>
<div id="streams_overlay_container"></div> <div id="streams_overlay_container"></div>
<div id="manage_groups_container"></div> <div id="groups_overlay_container"></div>
<div id="drafts_table"></div> <div id="drafts_table"></div>
<div id="scheduled_messages_overlay_container"></div> <div id="scheduled_messages_overlay_container"></div>
<div id="settings_overlay_container" class="overlay" data-overlay="settings" aria-hidden="true"> <div id="settings_overlay_container" class="overlay" data-overlay="settings" aria-hidden="true">

6
web/src/user_group_edit.js
View File

@@ -187,13 +187,13 @@ export function open_group_edit_panel_for_row(group_row) {
} }
export function initialize() { export function initialize() {
$("#manage_groups_container").on("click", ".group-row", function (e) { $("#groups_overlay_container").on("click", ".group-row", function (e) {
if ($(e.target).closest(".check, .user_group_settings_wrapper").length === 0) { if ($(e.target).closest(".check, .user_group_settings_wrapper").length === 0) {
open_group_edit_panel_for_row(this); open_group_edit_panel_for_row(this);
} }
}); });
$("#manage_groups_container").on("click", "#open_group_info_modal", (e) => { $("#groups_overlay_container").on("click", "#open_group_info_modal", (e) => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
const user_group_id = get_user_group_id(e.target); const user_group_id = get_user_group_id(e.target);
@@ -219,7 +219,7 @@ export function initialize() {
}); });
}); });
$("#manage_groups_container").on("click", ".group_settings_header .btn-danger", () => { $("#groups_overlay_container").on("click", ".group_settings_header .btn-danger", () => {
const active_group_data = user_group_settings_ui.get_active_data(); const active_group_data = user_group_settings_ui.get_active_data();
const group_id = active_group_data.id; const group_id = active_group_data.id;
const user_group = user_groups.get_user_group_from_id(group_id); const user_group = user_groups.get_user_group_from_id(group_id);

4
web/src/user_group_edit_members.js
View File

@@ -296,13 +296,13 @@ function remove_member({group_id, target_user_id, $list_entry}) {
export function initialize() { export function initialize() {
add_subscribers_pill.set_up_handlers({ add_subscribers_pill.set_up_handlers({
get_pill_widget: () => pill_widget, get_pill_widget: () => pill_widget,
$parent_container: $("#manage_groups_container"), $parent_container: $("#groups_overlay_container"),
pill_selector: ".edit_members_for_user_group .pill-container", pill_selector: ".edit_members_for_user_group .pill-container",
button_selector: ".edit_members_for_user_group .add-subscriber-button", button_selector: ".edit_members_for_user_group .add-subscriber-button",
action: add_new_members, action: add_new_members,
}); });
$("#manage_groups_container").on( $("#groups_overlay_container").on(
"submit", "submit",
".edit_members_for_user_group .subscriber_list_remove form", ".edit_members_for_user_group .subscriber_list_remove form",
(e) => { (e) => {

18
web/src/user_groups_settings_ui.js
View File

@@ -119,7 +119,7 @@ export function add_group_to_table(group) {
}); });
group_list_widget.replace_list_data(user_groups.get_realm_user_groups()); group_list_widget.replace_list_data(user_groups.get_realm_user_groups());
ui.get_content_element($("#manage_groups_container .settings")).append($(settings_html)); ui.get_content_element($("#groups_overlay_container .settings")).append($(settings_html));
// TODO: Address issue for visibility of newely created group. // TODO: Address issue for visibility of newely created group.
if (user_group_create.get_name() === group.name) { if (user_group_create.get_name() === group.name) {
@@ -181,11 +181,11 @@ export function setup_page(callback) {
const rendered = render_user_group_settings_overlay(template_data); const rendered = render_user_group_settings_overlay(template_data);
const $manage_groups_container = ui.get_content_element($("#manage_groups_container")); const $groups_overlay_container = ui.get_content_element($("#groups_overlay_container"));
$manage_groups_container.empty(); $groups_overlay_container.empty();
$manage_groups_container.append(rendered); $groups_overlay_container.append(rendered);
const $container = $("#manage_groups_container .user-groups-list"); const $container = $("#groups_overlay_container .user-groups-list");
const user_groups_list = user_groups.get_realm_user_groups(); const user_groups_list = user_groups.get_realm_user_groups();
group_list_widget = ListWidget.create($container, user_groups_list, { group_list_widget = ListWidget.create($container, user_groups_list, {
@@ -198,7 +198,7 @@ export function setup_page(callback) {
return render_browse_user_groups_list_item(item); return render_browse_user_groups_list_item(item);
}, },
filter: { filter: {
$element: $("#manage_groups_container .left #search_group_name"), $element: $("#groups_overlay_container .left #search_group_name"),
predicate(item, value) { predicate(item, value) {
return ( return (
item && item &&
@@ -225,14 +225,14 @@ export function setup_page(callback) {
} }
export function initialize() { export function initialize() {
$("#manage_groups_container").on("click", ".create_user_group_button", (e) => { $("#groups_overlay_container").on("click", ".create_user_group_button", (e) => {
e.preventDefault(); e.preventDefault();
open_create_user_group(); open_create_user_group();
}); });
$("#manage_groups_container").on("click", ".group-row", show_right_section); $("#groups_overlay_container").on("click", ".group-row", show_right_section);
$("#manage_groups_container").on("click", ".fa-chevron-left", () => { $("#groups_overlay_container").on("click", ".fa-chevron-left", () => {
$(".right").removeClass("show"); $(".right").removeClass("show");
$(".user-groups-header").removeClass("slide-left"); $(".user-groups-header").removeClass("slide-left");
}); });