Changeset 7890 for sandbox

Timestamp:

02/18/13 16:06:54 (11 years ago)

Author:

thiago

Message:

Ticket #3331 - Correção de dois problemas, seleção e muitas msg..

Location:

sandbox/2.5.1-expresso1

Files:

• expressoMail1_2/js/mail_archiver.js (modified) (1 diff)
• prototype/modules/attach_message/attach_message.js (modified) (5 diffs)

sandbox/2.5.1-expresso1/expressoMail1_2/js/mail_archiver.js

@@ -1766 +1766 @@
 }
 
+
+MailArchiver.prototype.getPreviewToAttach = function(id){
+    expresso_mail_archive.getMessageInfo(id);
+    expresso_mail_archive.getMessageBodies([id]);
+}
+
 MailArchiver.prototype.getSomeMsgs = function(msgIds){
     try{

sandbox/2.5.1-expresso1/prototype/modules/attach_message/attach_message.js

@@ -384 +384 @@
 
                 expresso_mail_archive.getMessagesByFolder(targetId,"ALL");
-                 
+
                 msgAll = expresso_mail_archive.msgAll;                
 
@@ -391 +391 @@
                 var flag = '';
                 
-
                 $.each(msgAll, function(i, msg){
                     from = $.parseJSON(msg['_from']);
+
+                    if(!from){
+                        from = {"mailbox":{"name":"null","route":"null","localPart":"null","domain":"null"}};
+                    }
+
                     flag = $.parseJSON(msg['_tags']);
                     id = msg['_id'];
@@ -481 +485 @@
                                 });
                                 
-                                // reconstrói a seleção das mensagens mesmo depois da mudança de pasta
+                                // reconstrói a seleção das mensagens mesmo depois da mudança de pasta
                                 if (selectedMessages[selectedFolder.id]) {
                                         for (var message in selectedMessages[selectedFolder.id]){
@@ -507 +511 @@
                                 if (selected) { 
                    if(selectedFolder['id'].indexOf("local_messages_") != -1){
-                        // Arrumar isso!
-                        //tabPanelTemplateId - mailpreview_tab_INBOX_1110
-                        //tabPanelTemplateLabel - Re: asduiahdih
-                        console.log(tabPanelTemplateId);
-                        tabPanelTemplateLabel =  "Re: asduiahdih";
-
-                            expresso_mail_archive.getMessageInfo(id);
-                            expresso_mail_archive.getMessageBodies([id]);
-
-                                var body = expresso_mail_archive.bodyPreview;
-                                var subject = expresso_mail_archive.subjectPreview;
-
-                                $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
-                                .find('.message.empty-container').hide().end()
-                                .find('#' + tabPanelTemplateId).html(body)
-                                .prepend(
-                                    '<div class="mailpreview-message-info">' + 
-                                        get_lang('Subject') + ': ' +
-                                        html_entities(subject) + 
-                                    '</div>'
-                                )
-                                .find('[class^="ExpressoCssWrapper"]').addClass("mailpreview-message-body");
-
+
+                        expresso_mail_archive.getPreviewToAttach(id);
+
+                        var body = expresso_mail_archive.bodyPreview;
+                        var subject = expresso_mail_archive.subjectPreview;
+                        tabPanelTemplateLabel =  subject.substring(0, $mailpreview_tabs_label_length) + '...';
+
+                        if (!$('#' + tabPanelTemplateId).length) {
+                            $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
+                            .find('.message.empty-container').hide().end()
+                            .find('#' + tabPanelTemplateId).html(body)
+                            .prepend(
+                                '<div class="mailpreview-message-info">' + 
+                                    get_lang('Subject') + ': ' +
+                                    html_entities(subject) + 
+                                '</div>'
+                            )
+                            .find('[class^="ExpressoCssWrapper"]').addClass("mailpreview-message-body");
+                        } else {
+                            $mailpreview_tabs.tabs('select', '#' + tabPanelTemplateId)
+                            .find('#' + tabPanelTemplateId + ', [href="#' + tabPanelTemplateId + '"]').removeClass('preview-message-unselected');
                         }
+                    }
                                         if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]) {
+
                                                 if (!selectedMessages[selectedFolder.id])
                                                         selectedMessages[selectedFolder.id] = {};
@@ -542 +546 @@
                                                         tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...';
                                                 
-                                                if (!$('#' + tabPanelTemplateId).length) {                                                              
+                                                if (!$('#' + tabPanelTemplateId).length) {
                                                         $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
                                                         .find('.message.empty-container').hide().end()