voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add spinners.close_button_spinner so user doesn't need spinnerCloser.

Browse source 
The window[button.spinnerCloser]() was always weird.
This commit is contained in:
voussoir 2022-03-23 14:55:26 -07:00
parent d620660975
commit 0d134b581b
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frontends/etiquette_flask/static/js/spinners.js
View file

@ -6,7 +6,7 @@ callback will close the spinner after it runs. But, if your initial function
decides not to launch the callback (insufficient parameters, failed clientside decides not to launch the callback (insufficient parameters, failed clientside
checks, etc.), you can have it return spinners.BAIL and the spinners will close checks, etc.), you can have it return spinners.BAIL and the spinners will close
immediately. Of course, you're always welcome to use immediately. Of course, you're always welcome to use
window[button.dataset.spinnerCloser](), but this return value means you don't spinners.close_button_spinner(button), but this return value means you don't
need to pull the button into a variable, as long as you weren't using the need to pull the button into a variable, as long as you weren't using the
return value anyway. return value anyway.
*/ */
@ -62,6 +62,12 @@ function add_to_spinner_group(group_id, button)
spinners.button_spinner_groups[group_id].push(button); spinners.button_spinner_groups[group_id].push(button);
} }
spinners.close_button_spinner =
function close_button_spinner(button)
{
window[button.dataset.spinnerCloser]();
}
spinners.close_grouped_spinners = spinners.close_grouped_spinners =
function close_grouped_spinners(group_id) function close_grouped_spinners(group_id)
{ {
@ -92,7 +98,7 @@ function init_button_with_spinner()
To create a button that has a spinner, and cannot be clicked again while To create a button that has a spinner, and cannot be clicked again while
the action is running, assign it the class "button_with_spinner". the action is running, assign it the class "button_with_spinner".
When you're ready for the spinner to disappear, call When you're ready for the spinner to disappear, call
window[button.dataset.spinnerCloser](). spinners.close_button_spinner(button).
Optional: Optional:
data-spinner-id: If you want to use your own element as the spinner, data-spinner-id: If you want to use your own element as the spinner,
@ -153,7 +159,7 @@ function init_button_with_spinner()
button.disabled = true; button.disabled = true;
} }
// It is expected that the function referenced by onclick will call // It is expected that the function referenced by onclick will call
// window[button.dataset.spinnerCloser]() when appropriate, since from // spinners.close_button_spinner(button) when appropriate, since from
// our perspective we cannot be sure when to close the spinner. // our perspective we cannot be sure when to close the spinner.
button.dataset.spinnerCloser = "spinner_closer_" + spinners.spinner_button_index; button.dataset.spinnerCloser = "spinner_closer_" + spinners.spinner_button_index;
window[button.dataset.spinnerCloser] = function spinner_closer() window[button.dataset.spinnerCloser] = function spinner_closer()