Merge from CVS HEAD: Don't do subjectline check until spellcheck-on-send is done

diff --git a/imp/js/compose-dimp.js b/imp/js/compose-dimp.js
index 6b35b6d..0cd7ce5 100644 (file)
--- a/imp/js/compose-dimp.js
+++ b/imp/js/compose-dimp.js
@@ -149,11 +149,6 @@ var DimpCompose = {
         if (action == 'sendMessage' || action == 'saveDraft') {
             switch (action) {
             case 'sendMessage':
-                if (($F('subject') == '') &&
-                    !window.confirm(DIMP.text_compose.nosubject)) {
-                    return;
-                }
-
                 if (!this.skip_spellcheck &&
                     DIMP.conf_compose.spellcheck &&
                     DIMP.SpellChecker &&
@@ -162,6 +157,11 @@ var DimpCompose = {
                     DIMP.SpellChecker.spellCheck();
                     return;
                 }
+
+                if (($F('subject') == '') &&
+                    !window.confirm(DIMP.text_compose.nosubject)) {
+                    return;
+                }
                 break;
             }
 

diff --git a/imp/js/compose.js b/imp/js/compose.js
index 7a619a2..04d0116 100644 (file)
--- a/imp/js/compose.js
+++ b/imp/js/compose.js
@@ -103,11 +103,6 @@ var ImpCompose = {
             break;
 
         case 'send_message':
-            if (($F('subject') == '') &&
-                !window.confirm(IMP.text.compose_nosubject)) {
-                return;
-            }
-
             if (!this.skip_spellcheck &&
                 this.spellcheck &&
                 IMP.SpellChecker &&
@@ -117,6 +112,11 @@ var ImpCompose = {
                 return;
             }
 
+            if (($F('subject') == '') &&
+                !window.confirm(IMP.text.compose_nosubject)) {
+                return;
+            }
+
             this.skip_spellcheck = false;
 
             if (IMP.SpellChecker) {