Changeset 565

Timestamp:

01/05/09 17:38:46 (15 years ago)

Author:

niltonneto

Message:

resolve #375

Location:

trunk/expressoMail1_2/js

Files:

• abas.js (modified) (3 diffs)
• main.js (modified) (2 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -212 +212 @@
 
         Element("border_id_" + ID).onclick = null;
-        
+
         if (msg_sent == 'false')
         {
@@ -221 +221 @@
                         {
                                 var save_link = Element("save_message_options");
-                                if ((body.contentWindow.document.designMode.toLowerCase() == 'on') && (save_link.onclick != ''))
-//                              if (! newMessageTab.toPreserve[ID])
+                                if (newMessageTab.toPreserve[ID] == undefined)
+                                        newMessageTab.toPreserve[ID] = false;
+                                if ((! newMessageTab.toPreserve[ID] && ! ID.match("_r")) || (body.contentWindow.document.designMode.toLowerCase() == 'on') && (save_link.onclick != ''))
                                 {
                                         var discard_msg = confirm(get_lang("Your message has not been sent. Discard your message?"), "");
@@ -231 +232 @@
                                         else
                                         {
-                                                if (newMessageTab.imapBox[ID] && ! newMessageTab.toPreserve[ID]){
+                                                if (newMessageTab.imapBox[ID] && !newMessageTab.toPreserve[ID]){
                                                         delete_msgs(newMessageTab.imapBox[ID], newMessageTab.imapUid[ID].toString(), 0)
                                                         delete(newMessageTab.imapBox[ID]);

trunk/expressoMail1_2/js/main.js

@@ -1048 +1048 @@
                 save_link.style.color = '#999';
                 watch_changes_in_msg(border_id);
-                
+                Element("send_button_"+border_id).style.visibility="visible";
                 write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
         }               
@@ -1054 +1054 @@
 
 function save_msg(border_id){
+        Element("send_button_"+border_id).style.visibility="hidden";
 
         if (newMessageTab.imapBox[border_id]) //Gets the imap folder