Changeset 7520

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.

Location:

trunk/expressoMail1_2/js

Files:

• abas.js (modified) (6 diffs)
• main.js (modified) (10 diffs)
• rich_text_editor.js (modified) (2 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;
 }

trunk/expressoMail1_2/js/main.js

@@ -463 +463 @@
 function watch_changes_in_msg(border_id)
 {
+    console.log("oi");
         if (document.getElementById('border_id_'+border_id))
         {
@@ -2246 +2247 @@
         var content = $("#content_id_"+new_border_ID);
 
+//It is verifying if the message was modified or not.
+var btnSaveVerify = function(){
+    $("#content_id_"+currentTab+" .save").button("disable")
+
+
+    $("#content_id_"+currentTab+" .to").keydown(function() {  
+        $("#content_id_"+currentTab+" .save").button("enable");
+     } );
+    $("#content_id_"+currentTab+" input[name=input_subject]").keydown(function() {  
+        $("#content_id_"+currentTab+" .save").button("enable");
+     } );
+
+    RichTextEditor.keydown(new_border_ID);
+}
+
 switch(type){
                 case "reply_without_history":
+            btnSaveVerify();
+
                         RichTextEditor.replyController = true; //Seta o editor como modo reply
                         content.find('[name="input_to"]').val(data.to);                 
@@ -2264 +2282 @@
                         break;
                 case "reply_with_history":
+            btnSaveVerify();
+
                         RichTextEditor.replyController = true; //Seta o editor como modo reply 
                         title = "Re: " + html_entities(data.subject);
@@ -2283 +2303 @@
                         break;
                 case "reply_to_all_without_history":
+            btnSaveVerify();
+
                         RichTextEditor.replyController = true; //Seta o editor como modo reply
                         // delete user email from to_all array.
@@ -2329 +2351 @@
                         break;
                 case "reply_to_all_with_history":
+            btnSaveVerify(); 
+
                         RichTextEditor.replyController = true; //Seta o editor como modo reply 
                         //delete user email from to_all array.
@@ -2383 +2407 @@
                         break;
                 case "forward":
+            btnSaveVerify();
+
                         title = "Fw: " + html_entities(data.subject);
                         content.find(".subject").val("Fw: " + data.subject);
@@ -2406 +2432 @@
                         break;
                 case "new":
+        
+        btnSaveVerify();
+
                         title = get_lang("New Message");
                         if(Element('msg_number').value) {
@@ -2435 +2464 @@
                         break;
                 case "edit":
-                
+                btnSaveVerify();
+
                         if(flagged == 'F')
                                 $(".important").addClass("expressomail-button-icon-ative");
@@ -3359 +3389 @@
 function autoSave( ID )
 {
+    $(".save").addClass("clicked");
+
         saveButtonDisabled = $("#content_id_"+ID).find(".save").button('option','disabled');
     if(autoSaveControl.status[ID] === false && !saveButtonDisabled)
@@ -3366 +3398 @@
 function save_msg(border_id){
     
+    if(!$("content_id_"+border_id+" .save").hasClass("clicked")){
+        $("content_id_"+border_id+" .save").addClass("clicked");
+    }
+
+
     //seta o status do auto_save = true
    if (preferences.auto_save_draft == 1)

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -176 +176 @@
                 save_link.unbind("click").click(function(){
                         openTab.toPreserve[id] = true;save_msg(id);
+            $(".save").addClass("clicked");
                 });
                 save_link.button({ disabled: false });
@@ -363 +364 @@
         element.setAttribute('contentEditable','true'); 
 } 
+cRichTextEditor.prototype.keydown = function (id,rec){
+    if (rec === undefined) rec = 1;
+    rec++;
+    if( CKEDITOR.instances['body_'+ id] === undefined ) return;    
+    var element = CKEDITOR.instances['body_'+ id];  
+    
+    if(element.document){
+        element.document.on('keydown',function(){
+            $("#content_id_"+currentTab+" .save").button("enable");
+        });
+    } else {
+        if (rec <= 20)
+                setTimeout(function(){RichTextEditor.keydown(id,rec)},500);
+    }
+}
 //Build the Object
 RichTextEditor = new cRichTextEditor();