Merge pull request #1246 from GedeonTS/make-send-btn-enabled

[FIX] Make the send button enabled on compose page
cypht-org · Sep 30, 2024 · b00223a · b00223a
2 parents bf3026f + 4eb2383
commit b00223a
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/modules/smtp/site.js b/modules/smtp/site.js
@@ -136,9 +136,7 @@ var save_compose_state = function(no_files, notice) {
     if (!body && !subject && !to && !cc && !bcc) {
         return;
     }
-
-    $('.smtp_send_placeholder').prop('disabled', true);
-    $('.smtp_send_placeholder').addClass('disabled_input');
+    $('.compose_draft_id').val(0)
     Hm_Ajax.request(
         [{'name': 'hm_ajax_hook', 'value': 'ajax_smtp_save_draft'},
         {'name': 'draft_body', 'value': body},
@@ -153,8 +151,6 @@ var save_compose_state = function(no_files, notice) {
         {'name': 'draft_to', 'value': to},
         {'name': 'uploaded_files', 'value': uploaded_files}],
         function(res) {
-            $('.smtp_send_placeholder').prop('disabled', false);
-            $('.smtp_send_placeholder').removeClass('disabled_input');
             if (res.draft_id) {
                 $('.compose_draft_id').val(res.draft_id);
             }
@@ -527,13 +523,34 @@ $(function () {
                 modal.open();
             }
 
-            function handleSendAnyway() {
+            function waitForValueChange(selector, targetValue) {
+                return new Promise((resolve) => {
+                    const checkValue = () => {
+                        if ($(selector).val() !== targetValue) {
+                            resolve();  
+                        } else {
+                            setTimeout(checkValue, 100); 
+                        }
+                    };
+                    checkValue();  
+                });
+            }
+
+            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 (handleMissingAttachment()) {
                     document.getElementsByClassName("smtp_send")[0].click();
                 } else {
                     e.preventDefault();
                 }
-            };
+            }
 
             function handleSendAnywayAndDontWarnMe() {
                 Hm_Utils.save_to_local_storage(dontWanValueInStorage, true);