From 055d7113f26926e47ad567aa551e5cae67215bb7 Mon Sep 17 00:00:00 2001 From: sahil839 Date: Mon, 5 Jul 2021 18:41:23 +0530 Subject: [PATCH] confirm_dialog: Rename html_yes_button to html_submit_button. This commit renames the html_yes_button parameter of confirm dialog widget to html_submit_button and also all the related variables in confirm_dialog.js. This will help in keeping a general name when deduplicating the code for confirm_dialog and edit_fields_modal. --- static/js/avatar.js | 2 +- static/js/confirm_dialog.js | 12 ++++++------ static/js/message_edit.js | 2 +- static/js/muting_ui.js | 2 +- static/js/settings_account.js | 2 +- static/js/settings_emoji.js | 2 +- static/js/settings_invites.js | 4 ++-- static/js/settings_org.js | 2 +- static/js/settings_user_groups.js | 2 +- static/js/settings_users.js | 2 +- static/js/starred_messages_ui.js | 4 ++-- static/js/stream_create.js | 2 +- static/js/stream_edit.js | 4 ++-- static/js/stream_popover.js | 2 +- static/js/subs.js | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/static/js/avatar.js b/static/js/avatar.js index 3a82bd1ab6..bb7da1ea45 100644 --- a/static/js/avatar.js +++ b/static/js/avatar.js @@ -103,7 +103,7 @@ export function build_user_avatar_widget(upload_function) { parent: modal_parent, html_heading: $t_html({defaultMessage: "Delete profile picture"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: delete_user_avatar, fade: true, }); diff --git a/static/js/confirm_dialog.js b/static/js/confirm_dialog.js index 0105b92ad5..fdde9d4472 100644 --- a/static/js/confirm_dialog.js +++ b/static/js/confirm_dialog.js @@ -62,7 +62,7 @@ export function launch(conf) { // templates. "html_heading", "html_body", - "html_yes_button", + "html_submit_button", "on_click", "parent", ]; @@ -89,13 +89,13 @@ export function launch(conf) { ); confirm_dialog.find(".confirm_dialog_body").append(conf.html_body); - const yes_button_span = confirm_dialog.find(".confirm_dialog_yes_button span"); + const submit_button_span = confirm_dialog.find(".confirm_dialog_yes_button span"); - yes_button_span.html(conf.html_yes_button); + submit_button_span.html(conf.html_submit_button); - const yes_button = confirm_dialog.find(".confirm_dialog_yes_button"); + const submit_button = confirm_dialog.find(".confirm_dialog_yes_button"); // Set up handlers. - yes_button.on("click", () => { + submit_button.on("click", () => { if (conf.loading_spinner) { show_confirm_dialog_spinner(); } else { @@ -112,6 +112,6 @@ export function launch(conf) { overlays.open_modal("#confirm_dialog_modal"); conf.parent.on("shown.bs.modal", () => { - yes_button.trigger("focus"); + submit_button.trigger("focus"); }); } diff --git a/static/js/message_edit.js b/static/js/message_edit.js index d5c928b82a..493afd502a 100644 --- a/static/js/message_edit.js +++ b/static/js/message_edit.js @@ -983,7 +983,7 @@ export function delete_message(msg_id) { parent: modal_parent, html_heading: $t_html({defaultMessage: "Delete message"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), help_link: "/help/edit-or-delete-a-message#delete-a-message", on_click: do_delete_message, loading_spinner: true, diff --git a/static/js/muting_ui.js b/static/js/muting_ui.js index d9168de1a2..4aaaf01cc6 100644 --- a/static/js/muting_ui.js +++ b/static/js/muting_ui.js @@ -146,7 +146,7 @@ export function confirm_mute_user(user_id) { html_heading: $t({defaultMessage: "Mute user"}), help_link: "/help/mute-a-user", html_body, - html_yes_button: $t({defaultMessage: "Confirm"}), + html_submit_button: $t({defaultMessage: "Confirm"}), on_click, }); } diff --git a/static/js/settings_account.js b/static/js/settings_account.js index 2556e15a9c..9cf454b760 100644 --- a/static/js/settings_account.js +++ b/static/js/settings_account.js @@ -602,7 +602,7 @@ export function set_up() { parent: modal_parent, html_heading: $t_html({defaultMessage: "Deactivate your account"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: handle_confirm, help_link: "/help/deactivate-your-account", fade: true, diff --git a/static/js/settings_emoji.js b/static/js/settings_emoji.js index daa914d750..c1de73ea99 100644 --- a/static/js/settings_emoji.js +++ b/static/js/settings_emoji.js @@ -269,7 +269,7 @@ export function set_up() { parent: modal_parent, html_heading: $t_html({defaultMessage: "Override built-in emoji?"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: submit_custom_emoji_request, fade: true, }); diff --git a/static/js/settings_invites.js b/static/js/settings_invites.js index f4c510047b..0b7b02053b 100644 --- a/static/js/settings_invites.js +++ b/static/js/settings_invites.js @@ -206,7 +206,7 @@ export function on_load_success(invites_data, initialize_event_handlers) { ? $t_html({defaultMessage: "Revoke invitation link"}) : $t_html({defaultMessage: "Revoke invitation to {email}"}, {email}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: do_revoke_invite, fade: true, }); @@ -232,7 +232,7 @@ export function on_load_success(invites_data, initialize_event_handlers) { parent: modal_parent, html_heading: $t_html({defaultMessage: "Resend invitation"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: do_resend_invite, fade: true, }); diff --git a/static/js/settings_org.js b/static/js/settings_org.js index c42c4a352d..dcfcb6b2bc 100644 --- a/static/js/settings_org.js +++ b/static/js/settings_org.js @@ -1174,7 +1174,7 @@ export function build_page() { html_heading: $t_html({defaultMessage: "Deactivate organization"}), help_link: "/help/deactivate-your-organization", html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: do_deactivate_realm, fade: true, }); diff --git a/static/js/settings_user_groups.js b/static/js/settings_user_groups.js index dd8531d9c9..969bae884a 100644 --- a/static/js/settings_user_groups.js +++ b/static/js/settings_user_groups.js @@ -366,7 +366,7 @@ export function set_up() { parent: modal_parent, html_heading: $t_html({defaultMessage: "Delete user group"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: delete_user_group, fade: true, }); diff --git a/static/js/settings_users.js b/static/js/settings_users.js index 57d14aa3b8..fb17d753fc 100644 --- a/static/js/settings_users.js +++ b/static/js/settings_users.js @@ -447,7 +447,7 @@ function confirm_deactivation(row, user_id, status_field) { parent: modal_parent, html_heading: $t_html({defaultMessage: "Deactivate {email}"}, {email: user.email}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: handle_confirm, fade: true, }); diff --git a/static/js/starred_messages_ui.js b/static/js/starred_messages_ui.js index ff27be0beb..b2a0f61f35 100644 --- a/static/js/starred_messages_ui.js +++ b/static/js/starred_messages_ui.js @@ -16,7 +16,7 @@ export function confirm_unstar_all_messages() { parent: modal_parent, html_heading: $t_html({defaultMessage: "Unstar all messages"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: message_flags.unstar_all_messages, }); } @@ -41,7 +41,7 @@ export function confirm_unstar_all_messages_in_topic(stream_id, topic) { parent: modal_parent, html_heading: $t_html({defaultMessage: "Unstar messages in topic"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click, }); } diff --git a/static/js/stream_create.js b/static/js/stream_create.js index 731847908e..a739ed2bc2 100644 --- a/static/js/stream_create.js +++ b/static/js/stream_create.js @@ -441,7 +441,7 @@ export function set_up_handlers() { parent: modal_parent, html_heading: $t_html({defaultMessage: "Large number of subscribers"}), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: () => { create_stream(); }, diff --git a/static/js/stream_edit.js b/static/js/stream_edit.js index e9a074542a..646b3c3b41 100644 --- a/static/js/stream_edit.js +++ b/static/js/stream_edit.js @@ -883,7 +883,7 @@ export function initialize() { {stream_name: sub.name}, ), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: remove_user_from_private_stream, fade: true, }); @@ -952,7 +952,7 @@ export function initialize() { ), help_link: "/help/archive-a-stream", html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: do_archive_stream, fade: true, }); diff --git a/static/js/stream_popover.js b/static/js/stream_popover.js index ecdd2726ee..ecc4f02e18 100644 --- a/static/js/stream_popover.js +++ b/static/js/stream_popover.js @@ -671,7 +671,7 @@ export function register_topic_handlers() { html_heading: $t_html({defaultMessage: "Delete topic"}), help_link: "/help/delete-a-topic", html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: () => { message_edit.delete_topic(stream_id, topic); }, diff --git a/static/js/subs.js b/static/js/subs.js index 7d5544a26e..6018c2371a 100644 --- a/static/js/subs.js +++ b/static/js/subs.js @@ -963,7 +963,7 @@ export function unsubscribe_from_private_stream(sub, from_stream_popover) { {stream_name: sub.name}, ), html_body, - html_yes_button: $t_html({defaultMessage: "Confirm"}), + html_submit_button: $t_html({defaultMessage: "Confirm"}), on_click: unsubscribe_from_stream, fade: true, });