mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 22:13:26 +00:00
move_modal: Focus input in "Move messages" and "Move topic" modals.
If user has permissions to move the message(s) to a different stream
and can't edit topic name then focus stream input; else, focus topic
input on "Move messages" and "Move topic" modals render by
`ui_util.place_caret_at_end($(".move_messages_edit_topic")[0])` to
position the cursor at end on focus.
Wrapped if else logic in function focus_on_move_modal_render()
and passed it to on_shown parameter of dialog_widget.launch()
to focus stream/topic input once widget is rendered.
Fixes #24805
This commit is contained in:
committed by
Tim Abbott
parent
cfbcbe901a
commit
bb78d9741f
@@ -22,6 +22,7 @@ import * as stream_data from "./stream_data";
|
|||||||
import * as stream_settings_ui from "./stream_settings_ui";
|
import * as stream_settings_ui from "./stream_settings_ui";
|
||||||
import * as sub_store from "./sub_store";
|
import * as sub_store from "./sub_store";
|
||||||
import * as ui_report from "./ui_report";
|
import * as ui_report from "./ui_report";
|
||||||
|
import * as ui_util from "./ui_util";
|
||||||
import * as unread_ops from "./unread_ops";
|
import * as unread_ops from "./unread_ops";
|
||||||
// We handle stream popovers and topic popovers in this
|
// We handle stream popovers and topic popovers in this
|
||||||
// module. Both are popped up from the left sidebar.
|
// module. Both are popped up from the left sidebar.
|
||||||
@@ -381,6 +382,14 @@ export function build_move_topic_to_stream_popover(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function focus_on_move_modal_render() {
|
||||||
|
if (!disable_stream_input && args.disable_topic_input) {
|
||||||
|
$("#select_stream_widget .button").trigger("focus");
|
||||||
|
} else {
|
||||||
|
ui_util.place_caret_at_end($(".move_messages_edit_topic")[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dialog_widget.launch({
|
dialog_widget.launch({
|
||||||
html_heading: modal_heading,
|
html_heading: modal_heading,
|
||||||
html_body: render_move_topic_to_stream(args),
|
html_body: render_move_topic_to_stream(args),
|
||||||
@@ -388,6 +397,7 @@ export function build_move_topic_to_stream_popover(
|
|||||||
id: "move_topic_modal",
|
id: "move_topic_modal",
|
||||||
on_click: move_topic,
|
on_click: move_topic,
|
||||||
loading_spinner: true,
|
loading_spinner: true,
|
||||||
|
on_shown: focus_on_move_modal_render,
|
||||||
post_render: move_topic_post_render,
|
post_render: move_topic_post_render,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user