Merge pull request #1235 from josaphatim/fixed-spinner-sieve

Always show spinner when copying/moving to mailbox
cypht-org · Sep 10, 2024 · 6723ab2 · 6723ab2
2 parents 7b87e36 + a495322
commit 6723ab2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git 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 `<div class="d-flex justify-content-center spinner">
+        <div class="spinner-${type} text-dark${size ? ` spinner-${type}-${size}` : ''}" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>`
+};
+
 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
@@ -678,11 +678,6 @@ $(function () {
                 '    </td>' +
                 extra_options +
                 '    <td class="col-sm-5">' +
-                '    <div class="d-flex justify-content-center spinner d-none">' +
-                '       <div class="spinner-border text-dark role="status">' +
-                '           <span class="visually-hidden">Loading...</span>' +
-                '       </div>' +
-                '    </div>' +
                 '    <input type="hidden" name="sieve_selected_action_value[]" value="">' +
                 '    </input>' +
                 '    <td class="col-sm-1 text-end align-middle">' +
@@ -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} ],