Changeset 7557

Timestamp:

11/23/12 11:57:42 (11 years ago)

Author:

eduardow

Message:

Ticket #3186 - Problema no salvamento de rascunhos no Expresso Mail.

Location:

branches/2.4/expressoMail1_2/js

Files:

• abas.js (modified) (3 diffs)
• main.js (modified) (9 diffs)
• rich_text_editor.js (modified) (1 diff)

branches/2.4/expressoMail1_2/js/abas.js

@@ -505 +505 @@
 {
         
-        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();
@@ -525 +525 @@
                 }
         }
-        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){
@@ -545 +556 @@
                 }
                 delete(openTab.type[ID]);
-        return true;
+        return true;*/ 
+            delete(openTab.type[ID]);
 }
 

branches/2.4/expressoMail1_2/js/main.js

@@ -2038 +2038 @@
         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);                 
@@ -2056 +2072 @@
                         break;
                 case "reply_with_history":
+                btnSaveVerify();
+
                         RichTextEditor.replyController = true; //Seta o editor como modo reply 
                         title = "Re: " + html_entities(data.subject);
@@ -2075 +2093 @@
                         break;
                 case "reply_to_all_without_history":
+                btnSaveVerify();
+
                         RichTextEditor.replyController = true; //Seta o editor como modo reply
                         // delete user email from to_all array.
@@ -2121 +2141 @@
                         break;
                 case "reply_to_all_with_history":
+                btnSaveVerify();
+
                         RichTextEditor.replyController = true; //Seta o editor como modo reply 
                         //delete user email from to_all array.
@@ -2175 +2197 @@
                         break;
                 case "forward":
+                btnSaveVerify();
+
                         title = "Fw: " + html_entities(data.subject);
                         content.find(".subject").val("Fw: " + data.subject);
@@ -2198 +2222 @@
                         break;
                 case "new":
+                btnSaveVerify();
+
                         title = get_lang("New Message");
                         if(Element('msg_number').value) {
@@ -2227 +2253 @@
                         break;
                 case "edit":
-                
+                btnSaveVerify();
+
                         if(flagged == 'F')
                                 $(".important").addClass("expressomail-button-icon-ative");
@@ -3085 +3112 @@
 function autoSave( ID )
 {
+        var content = $("#content_id_"+border_id); 
+        content.find(".save").button('option','disabled',true);
+
     saveButtonDisabled = $("#content_id_"+ID).find(".save").button('option','disabled'); 
         if(autoSaveControl.status[ID] === false && !saveButtonDisabled)
@@ -3091 +3121 @@
 
 function save_msg(border_id){
-    
+
     //seta o status do auto_save = true
    if (preferences.auto_save_draft == 1)

branches/2.4/expressoMail1_2/js/rich_text_editor.js

@@ -363 +363 @@
         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();