From 1a41a13ea3ff8b0cfbf833c0f26b4d6bbf3aaad2 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 8 May 2025 17:55:57 -0700 Subject: [PATCH] upload: Avoid unnecessary .one() usage to simplify test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both of these handlers immediately hide the banner, so the difference between .on() and .one() doesn’t matter. Signed-off-by: Anders Kaseorg --- web/src/upload.ts | 4 ++-- web/tests/upload.test.cjs | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/web/src/upload.ts b/web/src/upload.ts index 864426888f..fa7a4bb4c7 100644 --- a/web/src/upload.ts +++ b/web/src/upload.ts @@ -255,7 +255,7 @@ export let upload_files = ( true, ); // eslint-disable-next-line @typescript-eslint/no-loop-func - config.upload_banner_cancel_button(file_id).one("click", () => { + config.upload_banner_cancel_button(file_id).on("click", () => { compose_ui.replace_syntax(get_translated_status(file), "", config.textarea()); compose_ui.autosize_textarea(config.textarea()); config.textarea().trigger("focus"); @@ -264,7 +264,7 @@ export let upload_files = ( hide_upload_banner(uppy, config, file_id); }); // eslint-disable-next-line @typescript-eslint/no-loop-func - config.upload_banner_hide_button(file_id).one("click", () => { + config.upload_banner_hide_button(file_id).on("click", () => { hide_upload_banner(uppy, config, file_id); }); } diff --git a/web/tests/upload.test.cjs b/web/tests/upload.test.cjs index 1208484674..db574d47f5 100644 --- a/web/tests/upload.test.cjs +++ b/web/tests/upload.test.cjs @@ -217,15 +217,6 @@ test("upload_files", async ({mock_template, override, override_rewire}) => { assert.ok(banner_shown); override(realm, "max_file_upload_size_mib", 25); - let on_click_close_button_callback; - - $("#compose_banners .upload_banner.file_id_123 .upload_banner_cancel_button").one = ( - event, - callback, - ) => { - assert.equal(event, "click"); - on_click_close_button_callback = callback; - }; let compose_ui_insert_syntax_and_focus_called = false; override_rewire(compose_ui, "insert_syntax_and_focus", () => { compose_ui_insert_syntax_and_focus_called = true; @@ -288,7 +279,7 @@ test("upload_files", async ({mock_template, override, override_rewire}) => { assert.equal(new_syntax, ""); assert.equal($textarea, $("textarea#compose-textarea")); }); - on_click_close_button_callback(); + $("#compose_banners .upload_banner.file_id_123 .upload_banner_cancel_button").trigger("click"); assert.ok(remove_file_called); assert.ok(hide_upload_banner_called); assert.ok(compose_ui_autosize_textarea_called); @@ -298,7 +289,7 @@ test("upload_files", async ({mock_template, override, override_rewire}) => { remove_file_called = false; $("textarea#compose-textarea").val("user modified text"); - on_click_close_button_callback(); + $("#compose_banners .upload_banner.file_id_123 .upload_banner_cancel_button").trigger("click"); assert.ok(remove_file_called); assert.ok(hide_upload_banner_called); assert.ok(compose_ui_autosize_textarea_called);