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

stream_popover: Fix broken move topic to stream popover. 

`data("typeahead").unlisten()` of move topic to stream popover
crashed since we removed `data('typeahead')` in #29973.
This commit is contained in:
Aman Agrawal 2024-05-07 07:48:07 +00:00 committed by Tim Abbott
parent 982097f0a7
commit 3ffffd77ff
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/bootstrap_typeahead.ts
View File

@ -482,7 +482,6 @@ export class Typeahead<ItemType extends string | object> {
for (const event_ of events) { for (const event_ of events) {
$(this.input_element.$element).off(event_); $(this.input_element.$element).off(event_);
} }
this.input_element.$element.removeData("typeahead");
} }
resizeHandler(): void { resizeHandler(): void {

2
web/src/composebox_typeahead.js
View File

@ -1108,7 +1108,7 @@ export function initialize_topic_edit_typeahead(form_field, stream_name, dropup)
$element: form_field, $element: form_field,
type: "input", type: "input",
}; };
new Typeahead(bootstrap_typeahead_input, { return new Typeahead(bootstrap_typeahead_input, {
fixed: true, fixed: true,
dropup, dropup,
highlighter_html(item) { highlighter_html(item) {

14
web/src/stream_popover.js
View File

@ -32,6 +32,7 @@ import * as util from "./util";
// that pop up from the left sidebar. // that pop up from the left sidebar.
let stream_popover_instance = null; let stream_popover_instance = null;
let stream_widget_value; let stream_widget_value;
let move_topic_to_stream_topic_typeahead;
function get_popover_menu_items(sidebar_elem) { function get_popover_menu_items(sidebar_elem) {
if (!sidebar_elem) { if (!sidebar_elem) {
@ -489,8 +490,12 @@ export async function build_move_topic_to_stream_popover(
const $topic_input = $("#move_topic_form .move_messages_edit_topic"); 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(); move_topic_to_stream_topic_typeahead?.unlisten();
composebox_typeahead.initialize_topic_edit_typeahead($topic_input, new_stream_name, false); move_topic_to_stream_topic_typeahead = composebox_typeahead.initialize_topic_edit_typeahead(
$topic_input,
new_stream_name,
false,
);
} }
function render_selected_stream() { function render_selected_stream() {
@ -523,7 +528,7 @@ export async function build_move_topic_to_stream_popover(
$("#move_topic_modal .dialog_submit_button").prop("disabled", true); $("#move_topic_modal .dialog_submit_button").prop("disabled", true);
const $topic_input = $("#move_topic_form .move_messages_edit_topic"); const $topic_input = $("#move_topic_form .move_messages_edit_topic");
composebox_typeahead.initialize_topic_edit_typeahead( move_topic_to_stream_topic_typeahead = composebox_typeahead.initialize_topic_edit_typeahead(
$topic_input, $topic_input,
current_stream_name, current_stream_name,
false, false,
@ -581,6 +586,9 @@ export async function build_move_topic_to_stream_popover(
on_click: move_topic, on_click: move_topic,
loading_spinner: true, loading_spinner: true,
on_shown: focus_on_move_modal_render, on_shown: focus_on_move_modal_render,
on_hidden() {
move_topic_to_stream_topic_typeahead = undefined;
},
post_render: move_topic_post_render, post_render: move_topic_post_render,
}); });
} }