From 5b830a226cad4def8c38a227d13fff15e3a917bc Mon Sep 17 00:00:00 2001 From: Karl Stolley Date: Tue, 3 Oct 2023 14:43:55 -0500 Subject: [PATCH] compose: Name triggers for clearing the topic. --- web/src/compose_closed_ui.js | 2 +- web/src/compose_popovers.js | 2 +- web/src/compose_ui.js | 2 +- web/tests/compose_actions.test.js | 2 +- web/tests/compose_ui.test.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/compose_closed_ui.js b/web/src/compose_closed_ui.js index 896e058651..79a580ed84 100644 --- a/web/src/compose_closed_ui.js +++ b/web/src/compose_closed_ui.js @@ -169,7 +169,7 @@ export function initialize() { // Click handlers for buttons in the compose box. $("body").on("click", ".compose_stream_button", () => { - compose_actions.start("stream", {trigger: "new topic button"}); + compose_actions.start("stream", {trigger: "clear topic button"}); }); $("body").on("click", ".compose_private_button", () => { diff --git a/web/src/compose_popovers.js b/web/src/compose_popovers.js index 78103ea075..905fab6bcf 100644 --- a/web/src/compose_popovers.js +++ b/web/src/compose_popovers.js @@ -43,7 +43,7 @@ export function initialize() { onMount(instance) { const $popper = $(instance.popper); $popper.one("click", ".compose_mobile_stream_button", (e) => { - compose_actions.start("stream", {trigger: "new topic button"}); + compose_actions.start("stream", {trigger: "clear topic button"}); e.stopPropagation(); instance.hide(); }); diff --git a/web/src/compose_ui.js b/web/src/compose_ui.js index ab5c1113aa..95d825ddc1 100644 --- a/web/src/compose_ui.js +++ b/web/src/compose_ui.js @@ -51,7 +51,7 @@ function get_focus_area(msg_type, opts) { (msg_type === "stream" && opts.stream_id) || (msg_type === "private" && opts.private_message_recipient) ) { - if (opts.trigger === "new topic button") { + if (opts.trigger === "clear topic button") { return "#stream_message_recipient_topic"; } return "#compose-textarea"; diff --git a/web/tests/compose_actions.test.js b/web/tests/compose_actions.test.js index 854c5e7b5e..f5c09e2e04 100644 --- a/web/tests/compose_actions.test.js +++ b/web/tests/compose_actions.test.js @@ -152,7 +152,7 @@ test("start", ({override, override_rewire, mock_template}) => { stream_data.add_sub(denmark); compose_defaults = { - trigger: "new topic button", + trigger: "clear topic button", }; opts = {}; diff --git a/web/tests/compose_ui.test.js b/web/tests/compose_ui.test.js index 1d59c2c678..f0753715b9 100644 --- a/web/tests/compose_ui.test.js +++ b/web/tests/compose_ui.test.js @@ -886,7 +886,7 @@ run_test("get_focus_area", () => { get_focus_area("stream", { stream_id: 4, topic: "more", - trigger: "new topic button", + trigger: "clear topic button", }), "#stream_message_recipient_topic", );