Changeset 5826 for trunk/prototype/modules/attach_message/attach_message.js

Timestamp:

03/27/12 09:59:06 (12 years ago)

Author:

douglasz

Message:

Ticket #2486 - Correção dos sinalizadore e marcadore na tela de anexar mensagens.

File:

• trunk/prototype/modules/attach_message/attach_message.js (modified) (6 diffs)

trunk/prototype/modules/attach_message/attach_message.js

@@ -1 +1 @@
 // $.storage = new $.store();
-
+ 
 isOffline = /[A-z0-9-_\/\.]*:offline\?(.*)/;
 breakParams = /[&=]/;
@@ -114 +114 @@
                 };
         for(var flag in cell){
-                classes += '<span class="flags '+ (cell[flag]).toLowerCase() +((cell[flag]) == '' ? '"' : '" title="'+ get_lang((cell[flag])))+'"> </span>';    
-        }
-
-        if(rowObject.labels){           
-                classes += '<span class="flags labeled"> </span>';
+                classes += '<span class="flags '+ (cell[flag]).toLowerCase() + '"' + (cell[flag] != "" ? 'title="'+ get_lang(cell[flag])+'"' : '')+'> </span>'; 
+        }
+        
+        if(rowObject.labels){   
+                var titles = [];
+                var count = 0;
+                 for(i in rowObject.labels){
+                        titles[count] = " "+rowObject.labels[i].name;
+                        count++;
+                }
+                titles = titles.join();
+                classes += '<span class="flags labeled" title="'+titles+'"> </span>';
         }else{
                 classes += '<span class="flags"> </span>';
         }
+        
         if(rowObject.followupflagged){          
                 if(rowObject.followupflagged.followupflag.id < 7){
@@ -130 +138 @@
                 classes += '<span class="flags followupflagged" title="'+nameFollowupflag+'" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>';
         }
+
         return classes;
 }
@@ -395 +404 @@
                                 
                                 var tabPanelTemplateId = 'mailpreview_tab_' + selectedFolder.id.replace(/[.\/]/, '_') + '_' + message.msg_number;
-                                var tabPanelTemplateId = tabPanelTemplateId.replace(/[\s\/]/g, '-');
                                 
                                 if (selected) {         
@@ -457 +465 @@
 
                                                                 var tabPanelTemplateLabel = onceOpenedMessages[selectedFolder.id][message.msg_number].subject;
-                                                                selectedMessagesCount();
                                                                 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3)
                                                                         tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...';
-                                                                
+                                                
                                                                 if (!$('#' + tabPanelTemplateId).length) {                                                              
                                                                         $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
@@ -476 +483 @@
                                                                         .find('#' + tabPanelTemplateId + ', [href="#' + tabPanelTemplateId + '"]').removeClass('preview-message-unselected');
                                                                 }
-                                                                
+                                                                selectedMessagesCount();
                                                         }
                                                 });