Changeset 7710

Timestamp:

01/07/13 16:10:27 (11 years ago)

Author:

thiago

Message:

Ticket #3268 - Paginação dupla após pesquisa avançada

File:

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

trunk/expressoMail1_2/js/abas.js

@@ -511 +511 @@
 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();
-                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 == "")
-                {
-            var borderElem = Element("border_id_" + ID);
-                        borderElem.onclick = null;
-                        close_delete(ID, msg_sent);
-                }
-        }
-    */
+    var borderElem = Element("border_id_" + ID);
+    if (borderElem){
+        borderElem.onclick = null;
+    }else{
+        return false;
+    }
+
     if($("#content_id_"+currentTab+" textarea[name=input_to]").length ){
         if($("#content_id_"+currentTab+" .save").is(':disabled') ) {
@@ -542 +527 @@
         close_delete(ID, msg_sent);
     }
+
+    delete(openTab.type[ID]);
+    return true;
      
     /*var bolExecuteClose = true;
@@ -566 +554 @@
                 delete(openTab.type[ID]);
         return true;*/
-         delete(openTab.type[ID]);
-        return true;
+         
 }