From a49532264a3cd36067915bcc0132f9c0411b24b4 Mon Sep 17 00:00:00 2001 From: Josaphat Imani Date: Tue, 10 Sep 2024 20:27:06 +0200 Subject: [PATCH] Always show spinner when copying/moving to mailbox --- modules/core/site.js | 8 ++++++++ modules/sievefilters/site.js | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/core/site.js b/modules/core/site.js index 4f81a9bfc9..e44c6ab047 100644 --- a/modules/core/site.js +++ b/modules/core/site.js @@ -1858,6 +1858,14 @@ var err_msg = function(msg) { return "ERR"+hm_trans(msg); }; +var hm_spinner = function(type = 'border', size = '') { + return `
+
+ Loading... +
+
` +}; + var fillImapData = function(details) { $('#srv_setup_stepper_imap_address').val(details.server); $('#srv_setup_stepper_imap_port').val(details.port); diff --git a/modules/sievefilters/site.js b/modules/sievefilters/site.js index ef09e04bad..0817431e16 100644 --- a/modules/sievefilters/site.js +++ b/modules/sievefilters/site.js @@ -678,11 +678,6 @@ $(function () { ' ' + extra_options + ' ' + - '
' + - '
' + - ' Loading...' + - '
' + - '
' + ' ' + ' ' + ' ' + @@ -779,7 +774,7 @@ $(function () { } if (selected_action.type === 'mailbox') { let mailboxes = null; - tr_elem.children().find('.spinner').removeClass('d-none'); + tr_elem.children().eq(2).html(hm_spinner()); Hm_Ajax.request( [ {'name': 'hm_ajax_hook', 'value': 'ajax_sieve_get_mailboxes'}, {'name': 'imap_account', 'value': current_account} ],