Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Extract common logic for hide_spinners. 

Move the redundant code for hiding spinners and re-enabling buttons into
a common `hide_spinner` function inside `loading.ts`. This reduces
duplication between `hide_button_spinner` and `hide_dialog_spinner`.

Fixes #26691.
This commit is contained in:
Maneesh Shukla 2024-10-17 00:29:20 +05:30 committed by Tim Abbott
parent 666e7bf433
commit 158cb6c747
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/dialog_widget.ts
View File

@ -88,12 +88,11 @@ type RequestOpts = {
}; };
export function hide_dialog_spinner(): void { export function hide_dialog_spinner(): void {
$(".dialog_submit_button span").show();
const dialog_widget_selector = current_dialog_widget_selector(); const dialog_widget_selector = current_dialog_widget_selector();
const $spinner = $(`${dialog_widget_selector} .modal__spinner`);
$(`${dialog_widget_selector} .modal__btn`).prop("disabled", false); $(`${dialog_widget_selector} .modal__btn`).prop("disabled", false);
const $spinner = $(`${dialog_widget_selector} .modal__spinner`); loading.hide_spinner($(".dialog_submit_button"), $spinner);
loading.destroy_indicator($spinner);
} }
export function show_dialog_spinner(): void { export function show_dialog_spinner(): void {

8
web/src/loading.ts
View File

@ -106,3 +106,11 @@ export function show_spinner($button_element: JQuery, $spinner: JQuery): void {
height: span_height, height: span_height,
}); });
} }
export function hide_spinner($button_element: JQuery, $spinner: JQuery): void {
// Show the span
$button_element.find(".submit-button-text").show();
// Destroy the loading indicator
destroy_indicator($spinner);
}

3
web/src/user_profile.ts
View File

@ -95,8 +95,7 @@ export function show_button_spinner($button: JQuery): void {
export function hide_button_spinner($button: JQuery): void { export function hide_button_spinner($button: JQuery): void {
const $spinner = $button.find(".modal__spinner"); const $spinner = $button.find(".modal__spinner");
$button.prop("disabled", false); $button.prop("disabled", false);
$button.find("span").show(); loading.hide_spinner($button, $spinner);
loading.destroy_indicator($spinner);
} }
function compare_by_name( function compare_by_name(