diff --git a/tools/test-js-with-node b/tools/test-js-with-node index 97504f19f7..b7cf2fd309 100755 --- a/tools/test-js-with-node +++ b/tools/test-js-with-node @@ -75,6 +75,7 @@ EXEMPT_FILES = make_set( "web/src/compose_popovers.js", "web/src/compose_recipient.ts", "web/src/compose_reply.js", + "web/src/compose_send_menu_popover.js", "web/src/compose_setup.js", "web/src/compose_state.ts", "web/src/compose_textarea.ts", @@ -192,7 +193,6 @@ EXEMPT_FILES = make_set( "web/src/scheduled_messages.ts", "web/src/scheduled_messages_feed_ui.ts", "web/src/scheduled_messages_overlay_ui.js", - "web/src/scheduled_messages_popover.js", "web/src/scheduled_messages_ui.js", "web/src/scroll_bar.ts", "web/src/scroll_util.ts", diff --git a/web/src/scheduled_messages_popover.js b/web/src/compose_send_menu_popover.js similarity index 100% rename from web/src/scheduled_messages_popover.js rename to web/src/compose_send_menu_popover.js diff --git a/web/src/compose_setup.js b/web/src/compose_setup.js index d838475fa8..86ac882ccf 100644 --- a/web/src/compose_setup.js +++ b/web/src/compose_setup.js @@ -9,6 +9,7 @@ import * as compose_banner from "./compose_banner"; import * as compose_call from "./compose_call"; import * as compose_call_ui from "./compose_call_ui"; import * as compose_recipient from "./compose_recipient"; +import * as compose_send_menu_popover from "./compose_send_menu_popover"; import * as compose_state from "./compose_state"; import * as compose_ui from "./compose_ui"; import * as compose_validate from "./compose_validate"; @@ -23,7 +24,6 @@ import * as popovers from "./popovers"; import * as resize from "./resize"; import * as rows from "./rows"; import * as scheduled_messages from "./scheduled_messages"; -import * as scheduled_messages_popover from "./scheduled_messages_popover"; import * as stream_data from "./stream_data"; import * as stream_settings_components from "./stream_settings_components"; import * as sub_store from "./sub_store"; @@ -127,7 +127,7 @@ export function initialize() { if (is_edit_input) { message_edit.save_message_row_edit($row); } else if (event.target.dataset.validationTrigger === "schedule") { - scheduled_messages_popover.open_send_later_menu(); + compose_send_menu_popover.open_send_later_menu(); // We need to set this flag to true here because `open_send_later_menu` validates the message and sets // the user acknowledged wildcard flag back to 'false' and we don't want that to happen because then it @@ -231,7 +231,7 @@ export function initialize() { (event) => { event.preventDefault(); const send_at_timestamp = scheduled_messages.get_selected_send_later_timestamp(); - scheduled_messages_popover.do_schedule_message(send_at_timestamp); + compose_send_menu_popover.do_schedule_message(send_at_timestamp); }, ); diff --git a/web/src/hotkey.js b/web/src/hotkey.js index ca17f7392e..1ba7918d3e 100644 --- a/web/src/hotkey.js +++ b/web/src/hotkey.js @@ -10,6 +10,7 @@ import * as compose_actions from "./compose_actions"; import * as compose_banner from "./compose_banner"; import * as compose_recipient from "./compose_recipient"; import * as compose_reply from "./compose_reply"; +import * as compose_send_menu_popover from "./compose_send_menu_popover"; import * as compose_state from "./compose_state"; import * as compose_textarea from "./compose_textarea"; import * as condense from "./condense"; @@ -47,7 +48,6 @@ import * as read_receipts from "./read_receipts"; import * as recent_view_ui from "./recent_view_ui"; import * as recent_view_util from "./recent_view_util"; import * as scheduled_messages_overlay_ui from "./scheduled_messages_overlay_ui"; -import * as scheduled_messages_popover from "./scheduled_messages_popover"; import * as search from "./search"; import * as settings_data from "./settings_data"; import * as sidebar_ui from "./sidebar_ui"; @@ -503,7 +503,7 @@ export function process_enter_key(e) { // it since it is the trigger for the popover.