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

Add spinner text to clipboard refresh metadata button. 

Also replace usage of own in_progress variable with simply
disabling the button.
master
voussoir 2019-04-27 16:55:26 -07:00
parent c7e4bf16d2
commit 4ddf578d63
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontends/etiquette_flask/templates/clipboard.html
View File

@ -13,6 +13,7 @@
<script src="/static/js/api.js"></script> <script src="/static/js/api.js"></script>
<script src="/static/js/hotkeys.js"></script> <script src="/static/js/hotkeys.js"></script>
<script src="/static/js/photo_clipboard.js"></script> <script src="/static/js/photo_clipboard.js"></script>
<script src="/static/js/spinner.js"></script>
<script src="/static/js/tag_autocomplete.js"></script> <script src="/static/js/tag_autocomplete.js"></script>
<style> <style>
@ -119,6 +120,7 @@
<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" id="refresh_metadata_button" 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">
@ -300,11 +302,17 @@ function download_zip_form()
common.post(url, data, download_zip_callback); common.post(url, data, download_zip_callback);
} }
var refresh_in_progress = false; 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_in_progress = false; refresh_metadata_button.disabled = false;
refresh_metadata_button.classList.remove("gray_button");
refresh_metadata_button.classList.add("green_button");
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");
@ -317,11 +325,9 @@ function refresh_metadata_callback(response)
common.refresh(); common.refresh();
} }
} }
function refresh_metadata_form() function refresh_metadata_form()
{ {
if (refresh_in_progress)
{return;}
if (photo_clipboard.clipboard.size == 0) if (photo_clipboard.clipboard.size == 0)
{return;} {return;}
@ -329,7 +335,10 @@ 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_in_progress = true; refresh_metadata_spinner.show();
refresh_metadata_button.disabled = true;
refresh_metadata_button.classList.add("gray_button");
refresh_metadata_button.classList.remove("green_button");
common.post(url, data, refresh_metadata_callback); common.post(url, data, refresh_metadata_callback);
} }