Changeset 8063 for trunk/expressoMail1_2/js/draw_api.js

Timestamp:

03/28/13 16:24:07 (11 years ago)

Author:

marcosw

Message:

Ticket #3331 - Correção para inconsistência ao salvar mensagem e remover anexos

File:

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

trunk/expressoMail1_2/js/draw_api.js

@@ -4766 +4766 @@
     fileUploadMSG.find(' .attachments-list').show(); 
     var att = new Object(); 
-    att.folder = folder_name; 
-    att.uid = message_number; 
-    att.type = 'imapMSG'; 
-    att.name = Base64.encode(onceOpenedHeadersMessages[folder_name][message_number].subject + '.eml'); 
-    var idATT = JSON.stringify(att); 
-    addAttachment(ID, idATT); 
+
+   
+
     var attach = {}; 
     attach.fileName = onceOpenedHeadersMessages[folder_name][message_number].subject + '.eml'; 
@@ -4806 +4803 @@
     }); 
  
-    fileUploadMSG.find('.attachments-list').append(upload); 
- 
-    upload.find('.att-box-loading').remove(); 
- 
-    fileUploadMSG.find('.attachments-list .att-box:last').qtip( 
-    { 
-        content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", { 
-            attach: attach 
-        }), 
-        position: { 
-            corner: { 
-                tooltip: 'bottomMiddle', 
-                target: 'topMiddle' 
+    var addtip = function(attach){
+        fileUploadMSG.find('.attachments-list .att-box:last').qtip( 
+        { 
+            content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", { 
+                attach: attach 
+            }), 
+            position: { 
+                corner: { 
+                    tooltip: 'bottomMiddle', 
+                    target: 'topMiddle' 
+                }, 
+                adjust: { 
+                    resize: true, 
+                    scroll: true 
+                } 
             }, 
-            adjust: { 
-                resize: true, 
-                scroll: true 
+            show: { 
+                when: 'mouseover', 
+                // Don't specify a show event 
+                ready: false // Show the tooltip when ready 
+            }, 
+            hide: 'mouseout', 
+            // Don't specify a hide event 
+            style: { 
+                border: { 
+                    width: 1, 
+                    radius: 5 
+                }, 
+                width: { 
+                    min: 75, 
+                    max: 1000 
+                }, 
+                padding: 5, 
+                textAlign: 'center', 
+                tip: true, 
+                // Give it a speech bubble tip with automatic corner detection 
+                name: 'blue' // Style it according to the preset 'cream' style 
             } 
-        }, 
-        show: { 
-            when: 'mouseover', 
-            // Don't specify a show event 
-            ready: false // Show the tooltip when ready 
-        }, 
-        hide: 'mouseout', 
-        // Don't specify a hide event 
-        style: { 
-            border: { 
-                width: 1, 
-                radius: 5 
-            }, 
-            width: { 
-                min: 75, 
-                max: 1000 
-            }, 
-            padding: 5, 
-            textAlign: 'center', 
-            tip: true, 
-            // Give it a speech bubble tip with automatic corner detection 
-            name: 'blue' // Style it according to the preset 'cream' style 
-        } 
-    }); 
+        }); 
+    } 
+
+    if(folder_name.indexOf("local_messages_") != 0)
+    {
+        att.folder = folder_name; 
+        att.uid = message_number; 
+        att.type = 'imapMSG'; 
+        att.name = Base64.encode(onceOpenedHeadersMessages[folder_name][message_number].subject + '.eml'); 
+        var idATT = JSON.stringify(att); 
+        addAttachment(ID, idATT); 
+
+        fileUploadMSG.find('.attachments-list').append(upload);
+        addtip(attach);
+    }
+    else
+    {
+        var folder_trash = "INBOX"+cyrus_delimiter+special_folders["Trash"];
+        expresso_mail_archive.unarchieveToAttach(folder_name, folder_trash, message_number, function(data){
+            $.ajax({
+                url: "controller.php?action=$this.imap_functions.get_info_msg_archiver",
+                data:  {"idMsgs":data.idsMsg},
+                type: 'POST',
+                async: false,
+                success: function(data){
+                    data = JSON.parse(connector.unserialize(data));
+                    data = data[0];
+                    att.folder = folder_trash;
+                    att.uid = data.uid; 
+                    att.type = 'imapMSG'; 
+                    att.name = Base64.encode(onceOpenedHeadersMessages[folder_name][message_number].subject + '.eml'); 
+                    var idATT = JSON.stringify(att); 
+                    addAttachment(ID, idATT);
+                    fileUploadMSG.find('.attachments-list').append(upload);
+                    addtip(attach);
+                },
+            });
+        }); 
+    }
+    upload.find('.att-box-loading').remove();     
 }
                 
@@ -5245 +5278 @@
                                         if (message) {
                                                 /* Anexa a mensagem especificada (por folder e id_msg) 
-                                                   na mensagem sendo criada.*/ 
+                                                   na mensagem sendo criada.*/
                                                 attach_message(folder_name, message_number);
                                         }