Changeset 7913 for trunk/expressoMail1_2/js/main.js

Timestamp:

02/26/13 12:57:02 (11 years ago)

Author:

thiago

Message:

Ticket #3331 - Correção para anexar arquivos.

File:

• trunk/expressoMail1_2/js/main.js (modified) (7 diffs)

trunk/expressoMail1_2/js/main.js

@@ -3452 +3452 @@
 function send_valided_message(ID, folder, folder_name)
 { 
-        if (preferences.auto_save_draft == 1)
-           autoSaveControl.status[ID] = true;
-
-        var content = $("#content_id_"+ID);
-        var save_link = $("#content_id_"+ID).find(".save");
-        var onClick = save_link.onclick;
-        save_link.onclick = '';
-        save_link.button({disabled: true});
+    if (preferences.auto_save_draft == 1)
+       autoSaveControl.status[ID] = true;
+
+    var content = $("#content_id_"+ID);
+    var save_link = $("#content_id_"+ID).find(".save");
+    var onClick = save_link.onclick;
+    save_link.onclick = '';
+    save_link.button({disabled: true});
 
     var _subject = trim(content.find(".subject").val());
@@ -3474 +3474 @@
     $.each(array, function(index, value){
         stringReply += $(value).find("input").val() + ",";
-    }); 
+    }); 
     var stringToEmail = "";
     draw_email_box(content.find(".to-tr").find("textarea:first").val() || content.find(".to-tr").find("input:visible").val(), content.find(".to-tr").find("textarea:first"));
@@ -3509 +3509 @@
         });
     }
-    stringEmail +=      stringCCEmail;
+    stringEmail +=  stringCCEmail;
 
     var mailData = new Object();
@@ -3530 +3530 @@
     mailData.msg_forward_from = $(content).find('[name="msg_forward_from"]').val();
     mailData.msg_reply_from = $(content).find('[name="msg_reply_from"]').val();
-        
-        if ($(content).find('select[name="input_from"]').val())
-                mailData.input_from = $(content).find('select[name="input_from"]').val();
-
+    
+    if ($(content).find('select[name="input_from"]').val())
+        mailData.input_from = $(content).find('select[name="input_from"]').val();
+
+
+    var filesAux = [];
     // VERIFY IF EXISTS MESSAGE TO ATTACH
     if(typeof mailData.attachments == "object"){
 
+
+         if(mailData.attachments.files.length){
+            var files = mailData.attachments.files;
+            var filesAux = new Array();
+
+            $.each(files, function(i, each){
+               filesAux.push(JSON.stringify(each));
+            });
+        }
+
         // VERIFY IF EXISTS MESSAGE OF ARCHIVE
+
         if(mailData.attachments.archiver.length){
 
@@ -3589 +3602 @@
                 }
 
+                if(filesAux.length){
+                    $.each(filesAux, function(i, each){
+                        mailData.attachments.push(each);
+                    });
+                }
+
                 // GOOD, NOW THE ATTACHMENTS ARE READY TO SEND!
                 mailData.attachments = JSON.stringify(mailData.attachments);
             };
-        } else {
+        } else if(mailData.attachments.imap.length) {
             // IF THIS MESSAGE JUST HAVE IMAP MESSAGES
-            mailData.attachments = JSON.stringify(mailData.attachments.imap);
-            setTimeout(function(){ readyToSend() }, 30);
+            mailData.attachments = mailData.attachments.imap;
+            if(filesAux.length){
+                $.each(filesAux, function(i, each){
+                    mailData.attachments.push(each);
+                });
+            }
+            mailData.attachments = JSON.stringify(mailData.attachments);
+             setTimeout(function(){ readyToSend() }, 30);
+        } else if(mailData.attachments.files.length){
+            if(filesAux.length){
+                mailData.attachments = [];
+                $.each(filesAux, function(i, each){
+                    mailData.attachments.push(each);
+                });
+                mailData.attachments = JSON.stringify(mailData.attachments);
+                setTimeout(function(){ readyToSend() }, 30);
+            }
         }
+
     } else {
         // IF THIS MESSAGE DON'T HAVE ATTACHMENT, CALL READYTOSEND.
@@ -3606 +3641 @@
     readyToSend = function(){
     
-        if(stringEmail != ""){
-                $.ajax({
-                        url: "controller.php?action=$this.imap_functions.send_mail",
+        if(stringEmail != ""){
+            $.ajax({
+                url: "controller.php?action=$this.imap_functions.send_mail",
                 data:  mailData,
                 type: 'POST',
@@ -3620 +3655 @@
                     // HERE, I NEED TO DELETE THE MESSAGES THAT WERE UNARCHIVE FROM ARCHIVE.
                     delete_msgs("INBOX/Trash",expresso_mail_archive.idMsgsToAttach, false, false);
-                        },
-                        error: function(){
-                                write_msg(get_lang( 'Error trying to send the message. Retry in a few seconds...' ) );
+                },
+                error: function(){
+                    write_msg(get_lang( 'Error trying to send the message. Retry in a few seconds...' ) );
                     $(content).find('button.send').button('option', 'disabled', false);
                     var interval = setInterval(function(){
-                                                send_valided_message(ID,folder,folder_name);
-                                                clearInterval(interval);
-                                },15000);
-                                return;
-                        }
-                });
-        }else{
-                write_msg(get_lang("message without receiver"));
-                return;
-        }
+                            send_valided_message(ID,folder,folder_name);
+                            clearInterval(interval);
+                    },15000);
+                    return;
+                }
+            });
+        }else{
+            write_msg(get_lang("message without receiver"));
+            return;
+        }
         delete(expresso_mail_archive.idMsgsToAttach);
     };