Fix showing wait message while no draft is saving

Author: josaphatim

modules/smtp/js_modules/route_handlers.js

@@ -113,10 +113,10 @@ function applySmtpComposePageHandlers() {
         }
 
         async function handleSendAnyway() {
-            // if ($('.compose_draft_id').val() == '0') {
-            //     Hm_Notices.show([hm_trans('Please wait, sending message...')]);
-            //     await waitForValueChange('.compose_draft_id', '0');
-            // }
+            if ($('.saving_draft').val() !== '0') {
+                Hm_Notices.show([hm_trans('Please wait, sending message...')]);
+                await waitForValueChange('.saving_draft', '0');
+            }
 
             if (handleMissingAttachment()) {
                 if ($('.nexter_input').val()) {

modules/smtp/modules.php

@@ -1159,6 +1159,7 @@ protected function output() {
                 '<input type="hidden" name="next_email_post" class="compose_next_email_data" value="" />'.
                 '<input type="hidden" name="compose_msg_uid" value="'.$this->html_safe($msg_uid).'" />'.
                 '<input type="hidden" class="compose_draft_id" name="draft_id" value="'.$this->html_safe($draft_id).'" />'.
+                '<input type="hidden" class="saving_draft" name="draft_id" value="0" />'.
                 '<input type="hidden" class="compose_in_reply_to" name="compose_in_reply_to" value="'.$this->html_safe($in_reply_to).'" />'.
 
                 '<div class="to_outer">'.

modules/smtp/site.js

@@ -93,7 +93,7 @@ var save_compose_state = function(no_files, notice, schedule, callback) {
     if (!body && !subject && !to && !cc && !bcc) {
         return;
     }
-    $('.compose_draft_id').val(0)
+    $('.saving_draft').val(1);
     Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_smtp_save_draft'},
         {'name': 'draft_body', 'value': body},
         {'name': 'draft_id', 'value': draft_id},
@@ -109,6 +109,7 @@ var save_compose_state = function(no_files, notice, schedule, callback) {
         {'name': 'schedule', 'value': schedule ?? ''},
         {'name': 'compose_delivery_receipt', 'value': delivery_receipt ?? ''}],
         function(res) {
+            $('.saving_draft').val(0);
             if (res.draft_id) {
                 $('.compose_draft_id').val(res.draft_id);
             }
@@ -121,7 +122,11 @@ var save_compose_state = function(no_files, notice, schedule, callback) {
             }
         },
         [],
-        no_icon
+        no_icon,
+        false,
+        function () {
+            $('.saving_draft').val(0);
+        }
     );
 };