Changeset 6754 for branches/2.4/expressoMail1_2/js/abas.js

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.1.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/js/abas.js (modified) (5 diffs)

branches/2.4/expressoMail1_2/js/abas.js

@@ -270 +270 @@
         parent_bb.insertBefore(td, bb);
 
-        if((typeof(id_value) == 'string') && id_value.match(/_r/)){ 
+        if((typeof(id_value) == 'string') && id_value.match(/_r/)){
                 $(td).draggable({
                         start : function(){
@@ -306 +306 @@
                                                         var border_id = ui.draggable.find("input[type=hidden]").attr("name");
                                                         if(folder_to_move == "border_tr"){
-                                                                var id_msg = border_id.split("_")[0]; 
+                                                                var id_msg = border_id.split("_")[0];
                                                                 folder = $("#input_folder_"+border_id+"_r")[0] ? $("#input_folder_"+border_id+"_r").val() : (openTab.imapBox[border_id] ? openTab.imapBox[border_id]:get_current_folder());
                                                                 move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true);
@@ -400 +400 @@
         }
         var caption = "";
-        if (border != null){ 
-                    Element("font_"+border.id).style.width = (border_width - 35)+'px'; 
-                    Element("font_"+border.id).innerHTML = title; 
-        } 
+    if (border != null){
+                Element("font_"+border.id).style.width = (border_width - 35)+'px';
+                Element("font_"+border.id).innerHTML = title;
+        }
         return(title);
 }
@@ -435 +435 @@
                             'width' : width,
                             'onClose':  function(clicked) {
-                                                                        if(clicked == 'Cancelar'){ 
-                                                                                if (RichTextEditor.plain[id] != true)  
-                                                                                        setTimeout("RichTextEditor.focus("+ID+")",100);                   
-                                                                                else   
-                                                                                        $('#body_'+ID).focus();  
-                                                                        }
+                                                                        if(clicked == 'Cancelar'){
+                                                                                if (RichTextEditor.plain[id] != true) 
+                                                                                        setTimeout("RichTextEditor.focus("+ID+")",100);                  
+                                                                                else  
+                                                                                        $('#body_'+ID).focus(); 
+                                                                        }
                                     if(clicked == 'Descartar alterações' || clicked == 'Descartar alterações e anexos' ) {
                                         if (openTab.imapBox[ID] && !openTab.toPreserve[ID])
@@ -502 +502 @@
 function delete_border(ID, msg_sent)
 {
-    
-        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() || $("#content_id_"+ID).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() || $("#content_id_"+ID).find(".cc").val(); 
-                var cco = $("#content_id_"+ID).find(".cco").parent(".email-area").find("div").length || $("#content_id_"+ID).find(".email-area").find(".cco").val() || $("#content_id_"+ID).find(".cco").val(); 
-                var subject = $("#content_id_"+ID).find(".subject").val(); 
-                var auxAttachments = false; 
-                var attachments = $("#content_id_"+ID).find("ul.attachments-list").find("li").each(function(){ 
-                        ($(this).find("p").length > 0) ? auxAttachments = true : auxAttachments; 
-                        if(auxAttachments) 
-                                return false; 
-                }); 
-                var textArea = RichTextEditor.getData("body_"+ID); 
-                 
-                if(!to && !cc && !cco && !auxAttachments && subject == "" && textArea == "") 
-                        close_delete(ID, msg_sent); 
+        
+        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();
+                var cco = $("#content_id_"+ID).find(".cco").parent(".email-area").find("div").length || $("#content_id_"+ID).find(".email-area").find(".cco").val();
+                var subject = $("#content_id_"+ID).find(".subject").val();
+                var auxAttachments = false;
+                var attachments = $("#content_id_"+ID).find("ul.attachments-list").find("li").each(function(){
+                        ($(this).find("p").length > 0) ? auxAttachments = true : auxAttachments;
+                        if(auxAttachments)
+                                return false;
+                });
+                var textArea = RichTextEditor.getData("body_"+ID);
+                
+                if(!to && !cc && !cco && !auxAttachments && subject == "" && textArea == "")
+                        close_delete(ID, msg_sent);
         }
         var bolExecuteClose = true;