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

Replace bespoke spinner with new button_with_spinner.

Browse source
This commit is contained in:
voussoir 2019-06-15 16:04:06 -07:00
parent f842c2e49b
commit 802c12937b
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frontends/etiquette_flask/templates/clipboard.html
View file

@ -41,6 +41,11 @@
display: flex; display: flex;
padding: 8px; padding: 8px;
} }
#right .spinner_holder
{
display: flex;
flex: 1;
}
#right button #right button
{ {
flex: 1; flex: 1;
@ -119,8 +124,7 @@
</div> </div>
<div id="refresh_metadata_area"> <div id="refresh_metadata_area">
<button class="green_button" id="refresh_metadata_button" onclick="refresh_metadata_form();">Refresh metadata</button> <button class="green_button button_with_spinner" id="refresh_metadata_button" data-spinner-delay="500" data-onclick="refresh_metadata_form();">Refresh metadata</button>
<span id="refresh_metadata_spinner" class="hidden">Working...</span>
</div> </div>
<div id="searchhidden_area"> <div id="searchhidden_area">
@ -307,14 +311,11 @@ function download_zip_form()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
var refresh_metadata_button = document.getElementById("refresh_metadata_button"); var refresh_metadata_button = document.getElementById("refresh_metadata_button");
var refresh_metadata_spinner = document.getElementById("refresh_metadata_spinner");
refresh_metadata_spinner = new spinner.Spinner(refresh_metadata_spinner);
function refresh_metadata_callback(response) function refresh_metadata_callback(response)
{ {
response = response["data"]; response = response["data"];
refresh_metadata_button.disabled = false; window[refresh_metadata_button.dataset.spinnerCloser]();
refresh_metadata_spinner.hide();
if ("error_type" in response) if ("error_type" in response)
{ {
var message_area = document.getElementById("message_area"); var message_area = document.getElementById("message_area");
@ -337,8 +338,6 @@ function refresh_metadata_form()
var photo_ids = Array.from(photo_clipboard.clipboard).join(","); var photo_ids = Array.from(photo_clipboard.clipboard).join(",");
var data = new FormData(); var data = new FormData();
data.append("photo_ids", photo_ids); data.append("photo_ids", photo_ids);
refresh_metadata_spinner.show();
refresh_metadata_button.disabled = true;
common.post(url, data, refresh_metadata_callback); common.post(url, data, refresh_metadata_callback);
} }