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

Timestamp:

02/22/13 13:47:56 (11 years ago)

Author:

marcosw

Message:

Ticket #3331 - Correções para inconsistencia de anexar mensagem por aba e por janela

File:

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

trunk/expressoMail1_2/js/draw_api.js

@@ -4757 +4757 @@
                 message_number: id da mensagem sendo anexada. 
 */ 
-function attach_message (folder_name, message_number) { 
+function attach_message (folder_name, message_number, message_cache) { 
     var ID = currentTab; 
     var fileUploadMSG = $('#fileupload_msg'+ID); 
@@ -4765 +4765 @@
     att.uid = message_number; 
     att.type = 'imapMSG'; 
-    att.name = Base64.encode(onceOpenedMessages[folder_name][message_number].subject + '.eml'); 
+    att.name = Base64.encode(message_cache[folder_name][message_number].subject + '.eml'); 
     var idATT = JSON.stringify(att); 
     addAttachment(ID, idATT); 
     var attach = {}; 
-    attach.fileName = onceOpenedMessages[folder_name][message_number].subject + '.eml'; 
-    attach.fullFileName = onceOpenedMessages[folder_name][message_number].subject + '.eml'; 
-    if(attach.fileName.length > 20)  
-    { 
+    attach.fileName = message_cache[folder_name][message_number].subject + '.eml'; 
+    attach.fullFileName = message_cache[folder_name][message_number].subject + '.eml'; 
+    if(attach.fileName.length > 20){ 
         attach.fileName = attach.fileName.substr(0, 17) + "... " + attach.fileName.substr(attach.fileName.length - 9, attach.fileName.length); 
     } 
- 
     attach.error = false; 
-    attach.OK = true; 
-    attach.fileSize = formatBytes(onceOpenedMessages[folder_name][message_number].size); 
+    attach.OK = true;
+    if (folder_name.indexOf('local_messages_') == 0){
+        attach.fileSize = formatBytes(message_cache[folder_name][message_number].size);
+    } else {
+        attach.fileSize = formatBytes(message_cache[folder_name][message_number].Size); 
+    }
     var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", { 
         file: attach 
@@ -5240 +5242 @@
                                                 /* Anexa a mensagem especificada (por folder e id_msg) 
                                                    na mensagem sendo criada.*/ 
-                                                attach_message(folder_name, message_number);
+                                                attach_message(folder_name, message_number, onceOpenedMessages);
                                         }
                                 });