From cfbcbe901a290669ae856ebd2ef813ea9d65861d Mon Sep 17 00:00:00 2001 From: Hardik Dharmani Date: Tue, 18 Apr 2023 20:54:55 +0530 Subject: [PATCH] topic_edit: Rename `inline_topic_edit` to `move_messages_edit_topic`. In move_topic modal, Renamed inline_topic_edit to move_messages_edit_topic to be more specific selector as inline_topic_edit is also used in message header. Additionally, Removed id inline_topic_edit as it was only used in zulip.css instead used `.inline_topic_edit` selector as that element also have class with same name inline_topic_edit. Fixes #24805 --- web/src/stream_popover.js | 6 +++--- web/styles/popovers.css | 2 +- web/styles/zulip.css | 4 ++-- web/templates/move_topic_to_stream.hbs | 4 ++-- web/templates/topic_edit_form.hbs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/src/stream_popover.js b/web/src/stream_popover.js index b7d58324d4..20aaf4115e 100644 --- a/web/src/stream_popover.js +++ b/web/src/stream_popover.js @@ -325,7 +325,7 @@ export function build_move_topic_to_stream_popover( } function set_stream_topic_typeahead() { - const $topic_input = $("#move_topic_form .inline_topic_edit"); + const $topic_input = $("#move_topic_form .move_messages_edit_topic"); const new_stream_id = Number(stream_widget.value(), 10); const new_stream_name = sub_store.get(new_stream_id).name; $topic_input.data("typeahead").unlisten(); @@ -340,7 +340,7 @@ export function build_move_topic_to_stream_popover( function move_topic_post_render() { $("#move_topic_modal .dialog_submit_button").prop("disabled", true); - const $topic_input = $("#move_topic_form .inline_topic_edit"); + const $topic_input = $("#move_topic_form .move_messages_edit_topic"); composebox_typeahead.initialize_topic_edit_typeahead( $topic_input, current_stream_name, @@ -376,7 +376,7 @@ export function build_move_topic_to_stream_popover( stream_widget.setup(); $("#select_stream_widget .dropdown-toggle").prop("disabled", disable_stream_input); - $("#move_topic_modal .inline_topic_edit").on("input", () => { + $("#move_topic_modal .move_messages_edit_topic").on("input", () => { update_submit_button_disabled_state(stream_widget.value()); }); } diff --git a/web/styles/popovers.css b/web/styles/popovers.css index 10d3290daa..04ce5433c6 100644 --- a/web/styles/popovers.css +++ b/web/styles/popovers.css @@ -827,7 +827,7 @@ ul { .dropdown-list-widget, .stream_header_colorblock, - .inline_topic_edit { + .move_messages_edit_topic { margin-bottom: 10px; } diff --git a/web/styles/zulip.css b/web/styles/zulip.css index b06eb9394a..b8667727f8 100644 --- a/web/styles/zulip.css +++ b/web/styles/zulip.css @@ -1698,7 +1698,7 @@ div.focused_table { } } -#inline_topic_edit { +.inline_topic_edit { margin-bottom: 5px; width: 206px; @@ -1722,7 +1722,7 @@ div.focused_table { justify-content: flex-start; } -#inline_topic_edit:focus, +.inline_topic_edit:focus, #message_edit_topic:focus { outline: none; } diff --git a/web/templates/move_topic_to_stream.hbs b/web/templates/move_topic_to_stream.hbs index 50b1ada707..0b2557a598 100644 --- a/web/templates/move_topic_to_stream.hbs +++ b/web/templates/move_topic_to_stream.hbs @@ -17,8 +17,8 @@ {{/unless}} - - + + {{#if from_message_actions_popover}}