Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Hardik Dharmani 2023-04-18 20:54:55 +05:30 committed by Tim Abbott
parent f025415f2b
commit cfbcbe901a
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/stream_popover.js
View File

@ -325,7 +325,7 @@ export function build_move_topic_to_stream_popover(
} }
function set_stream_topic_typeahead() { 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_id = Number(stream_widget.value(), 10);
const new_stream_name = sub_store.get(new_stream_id).name; const new_stream_name = sub_store.get(new_stream_id).name;
$topic_input.data("typeahead").unlisten(); $topic_input.data("typeahead").unlisten();
@ -340,7 +340,7 @@ export function build_move_topic_to_stream_popover(
function move_topic_post_render() { function move_topic_post_render() {
$("#move_topic_modal .dialog_submit_button").prop("disabled", true); $("#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( composebox_typeahead.initialize_topic_edit_typeahead(
$topic_input, $topic_input,
current_stream_name, current_stream_name,
@ -376,7 +376,7 @@ export function build_move_topic_to_stream_popover(
stream_widget.setup(); stream_widget.setup();
$("#select_stream_widget .dropdown-toggle").prop("disabled", disable_stream_input); $("#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()); update_submit_button_disabled_state(stream_widget.value());
}); });
} }

2
web/styles/popovers.css
View File

@ -827,7 +827,7 @@ ul {
.dropdown-list-widget, .dropdown-list-widget,
.stream_header_colorblock, .stream_header_colorblock,
.inline_topic_edit { .move_messages_edit_topic {
margin-bottom: 10px; margin-bottom: 10px;
} }

4
web/styles/zulip.css
View File

@ -1698,7 +1698,7 @@ div.focused_table {
} }
} }
#inline_topic_edit { .inline_topic_edit {
margin-bottom: 5px; margin-bottom: 5px;
width: 206px; width: 206px;
@ -1722,7 +1722,7 @@ div.focused_table {
justify-content: flex-start; justify-content: flex-start;
} }
#inline_topic_edit:focus, .inline_topic_edit:focus,
#message_edit_topic:focus { #message_edit_topic:focus {
outline: none; outline: none;
} }

4
web/templates/move_topic_to_stream.hbs
View File

@ -17,8 +17,8 @@
</div> </div>
<i class="fa fa-angle-right" aria-hidden="true"></i> <i class="fa fa-angle-right" aria-hidden="true"></i>
{{/unless}} {{/unless}}
<input name="new_topic_name" type="text" class="inline_topic_edit modal_text_input" autocomplete="off" value="{{topic_name}}" {{#if disable_topic_input}}disabled{{/if}} /> <input name="new_topic_name" type="text" class="move_messages_edit_topic modal_text_input" autocomplete="off" value="{{topic_name}}" {{#if disable_topic_input}}disabled{{/if}} />
<input name="old_topic_name" type="hidden" class="inline_topic_edit" value="{{topic_name}}" /> <input name="old_topic_name" type="hidden" class="move_messages_edit_topic" value="{{topic_name}}" />
<input name="current_stream_id" type="hidden" value="{{current_stream_id}}" /> <input name="current_stream_id" type="hidden" value="{{current_stream_id}}" />
{{#if from_message_actions_popover}} {{#if from_message_actions_popover}}
<select class="message_edit_topic_propagate modal_select bootstrap-focus-style"> <select class="message_edit_topic_propagate modal_select bootstrap-focus-style">

2
web/templates/topic_edit_form.hbs
View File

@ -1,7 +1,7 @@
{{! Client-side Handlebars template for rendering the topic edit form. }} {{! Client-side Handlebars template for rendering the topic edit form. }}
<form id="topic_edit_form"> <form id="topic_edit_form">
<input type="text" value="" class="inline_topic_edit header-v" id="inline_topic_edit" <input type="text" value="" class="inline_topic_edit header-v"
autocomplete="off" maxlength="{{ max_topic_length }}" /> autocomplete="off" maxlength="{{ max_topic_length }}" />
<button type="button" class="topic_edit_save small_square_button animated-purple-button"><i class="fa fa-check" aria-hidden="true"></i></button> <button type="button" class="topic_edit_save small_square_button animated-purple-button"><i class="fa fa-check" aria-hidden="true"></i></button>
<button type="button" class="topic_edit_cancel small_square_button small_square_x"><i class="fa fa-remove" aria-hidden="true"></i></button> <button type="button" class="topic_edit_cancel small_square_button small_square_x"><i class="fa fa-remove" aria-hidden="true"></i></button>