paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 17:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload: Avoid unnecessary .one() usage to simplify test.

Browse Source 
Both of these handlers immediately hide the banner, so the difference
between .on() and .one() doesn’t matter.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2025-05-08 17:55:57 -07:00
committed by Tim Abbott
parent 15e04b1d8a
commit 1a41a13ea3
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/upload.ts
View File

@@ -255,7 +255,7 @@ export let upload_files = (
true, true,
); );
// eslint-disable-next-line @typescript-eslint/no-loop-func // 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.replace_syntax(get_translated_status(file), "", config.textarea());
compose_ui.autosize_textarea(config.textarea()); compose_ui.autosize_textarea(config.textarea());
config.textarea().trigger("focus"); config.textarea().trigger("focus");
@@ -264,7 +264,7 @@ export let upload_files = (
hide_upload_banner(uppy, config, file_id); hide_upload_banner(uppy, config, file_id);
}); });
// eslint-disable-next-line @typescript-eslint/no-loop-func // 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); hide_upload_banner(uppy, config, file_id);
}); });
} }

13
web/tests/upload.test.cjs
View File

@@ -217,15 +217,6 @@ test("upload_files", async ({mock_template, override, override_rewire}) => {
assert.ok(banner_shown); assert.ok(banner_shown);
override(realm, "max_file_upload_size_mib", 25); 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; let compose_ui_insert_syntax_and_focus_called = false;
override_rewire(compose_ui, "insert_syntax_and_focus", () => { override_rewire(compose_ui, "insert_syntax_and_focus", () => {
compose_ui_insert_syntax_and_focus_called = true; 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(new_syntax, "");
assert.equal($textarea, $("textarea#compose-textarea")); 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(remove_file_called);
assert.ok(hide_upload_banner_called); assert.ok(hide_upload_banner_called);
assert.ok(compose_ui_autosize_textarea_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; remove_file_called = false;
$("textarea#compose-textarea").val("user modified text"); $("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(remove_file_called);
assert.ok(hide_upload_banner_called); assert.ok(hide_upload_banner_called);
assert.ok(compose_ui_autosize_textarea_called); assert.ok(compose_ui_autosize_textarea_called);