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

Timestamp:

05/10/12 18:10:03 (12 years ago)

Author:

angelo

Message:

Ticket #2716 - Tela de anexar mensagens interpreta o html prejudicando o layout

File:

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

trunk/prototype/modules/attach_message/attach_message.js

@@ -183 +183 @@
 }
 
+NormaliseSubject = function(cellvalue, options, rowObject) {
+        return html_entities(cellvalue);
+}
+
 date2Time = function (timestamp) {
         var date = new Date();
@@ -228 +232 @@
 function adaptOffline( data )
 {
-    if( preferences.use_local_messages == 1 || expresso_offline )
+    if( preferences.use_local_messages == 1 || expresso_offline)
     {
         var folders = expresso_local_messages.list_local_folders();
@@ -247 +251 @@
         });
     }
-
+        
     return( data );
+        
 }
 
@@ -352 +357 @@
                                 {name:'flags',index:'msg_number',edittype: 'image', width:100, sortable:false, formatter:flags2Class, title :false},
                                 {name:'from.name',index:'msg_number', width:70, sortable:false, formatter:NormaliseFrom},
-                                {name:'subject',index:'subject', width:245, sortable:false},
+                                {name:'subject',index:'subject', width:245, sortable:false,formatter:NormaliseSubject},
                                 {name:'timestamp',index:'timestamp', width:65, align:"center", sortable:false, formatter:date2Time},
                                 {name:'size',index:'size', width:55, align:"right", sortable:false, formatter:bytes2Size}
@@ -410 +415 @@
                                 var tabPanelTemplateId = tabPanelTemplateId.replace(/[\s\/]/g, '-'); 
                                 
-                                if (selected) {         
+                                if (selected) { 
                                         if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]) {
                                                 if (!selectedMessages[selectedFolder.id])
@@ -418 +423 @@
                                                 $('#mailpreview-container').unblock();                                          
 
-                                                var tabPanelTemplateLabel = onceOpenedMessages[selectedFolder.id][message.msg_number].subject;
+                                                var tabPanelTemplateLabel = html_entities(onceOpenedMessages[selectedFolder.id][message.msg_number].subject);
                                                 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3)
                                                         tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...';
@@ -433 +438 @@
                                         } else {
                                                 jQuery('#mailpreview_container').block({  
-                                                        message: '<div id="loading-content"><div class="image"> </div></div>',  
+                                                        message: '<div id="loading-content"><div class="image"></div></div>',  
                                                         css: {  
                                                                 backgroundImage: 'url('+BASE_PATH+'modules/attach_message/images/loading.gif)',  
@@ -469 +474 @@
                                                                 $('#mailpreview_container').unblock();
 
-                                                                var tabPanelTemplateLabel = onceOpenedMessages[selectedFolder.id][message.msg_number].subject;
+                                                                var tabPanelTemplateLabel = html_entities(onceOpenedMessages[selectedFolder.id][message.msg_number].subject);
                                                                 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3)
                                                                         tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...';
@@ -481 +486 @@
                                                                                 '<div class="mailpreview-message-info">' + 
                                                                                         get_lang('Subject') + ': ' +
-                                                                                        onceOpenedMessages[selectedFolder.id][message.msg_number].subject + 
+                                                                                        html_entities(onceOpenedMessages[selectedFolder.id][message.msg_number].subject) + 
                                                                                 '</div>'
                                                                         )