Changeset 7520 for trunk/expressoMail1_2/js/abas.js

Timestamp:

11/14/12 15:35:36 (11 years ago)

Author:

thiago

Message:

Ticket #3186 - Problema ao fechar mensagem que foi editada ou que tenha uma assinatura.

File:

• trunk/expressoMail1_2/js/abas.js (modified) (6 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -452 +452 @@
                                         delete(openTab.type[ID]);
                                         close_delete(ID, msg_sent);
+                                       
                                     }
                                     else if(clicked == 'Salvar e fechar' || clicked == 'Salvar estado atual fechar')
@@ -457 +458 @@
                                         save_msg(ID);
                                         openTab.toPreserve[ID] = false;
+                                    
                                         close_delete(ID, msg_sent);
                                         delete(openTab.type[ID]);
@@ -507 +509 @@
 function delete_border(ID, msg_sent)
 {
-        
-        if($("#border_id_"+ID).attr("title") == get_lang("New Message")){
+
+        /*if($("#border_id_"+ID).attr("title") == get_lang("New Message")){
                 var to = $("#content_id_"+ID).find(".to").parent(".email-area").find("div").length || $("#content_id_"+ID).find(".email-area").find(".to").val();
                 var cc = $("#content_id_"+ID).find(".cc").parent(".email-area").find("div").length || $("#content_id_"+ID).find(".email-area").find(".cc").val();
@@ -528 +530 @@
                 }
         }
-        var bolExecuteClose = true;
+    */
+    if($("#content_id_"+currentTab+" textarea[name=input_to]").length ){
+        if($("#content_id_"+currentTab+" .save").is(':disabled') ) {
+             close_delete(ID, msg_sent);
+        } else if( $("#content_id_"+currentTab+" .save").is(':enabled') ) {
+             return(draftTests(ID, msg_sent));
+        }
+    } else {
+        close_delete(ID, msg_sent);
+    }
+     
+    /*var bolExecuteClose = true;
         var borderElem = Element("border_id_" + ID);
         if (borderElem){
@@ -543 +556 @@
             }
         }
+    
+        
         if (bolExecuteClose)
         {
@@ -548 +563 @@
                 }
                 delete(openTab.type[ID]);
+        return true;*/
+         delete(openTab.type[ID]);
         return true;
 }