Changeset 6161 for trunk/prototype/modules
- Timestamp:
- 05/10/12 18:10:03 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/attach_message/attach_message.js
r5846 r6161 183 183 } 184 184 185 NormaliseSubject = function(cellvalue, options, rowObject) { 186 return html_entities(cellvalue); 187 } 188 185 189 date2Time = function (timestamp) { 186 190 var date = new Date(); … … 228 232 function adaptOffline( data ) 229 233 { 230 if( preferences.use_local_messages == 1 || expresso_offline 234 if( preferences.use_local_messages == 1 || expresso_offline) 231 235 { 232 236 var folders = expresso_local_messages.list_local_folders(); … … 247 251 }); 248 252 } 249 253 250 254 return( data ); 255 251 256 } 252 257 … … 352 357 {name:'flags',index:'msg_number',edittype: 'image', width:100, sortable:false, formatter:flags2Class, title :false}, 353 358 {name:'from.name',index:'msg_number', width:70, sortable:false, formatter:NormaliseFrom}, 354 {name:'subject',index:'subject', width:245, sortable:false },359 {name:'subject',index:'subject', width:245, sortable:false,formatter:NormaliseSubject}, 355 360 {name:'timestamp',index:'timestamp', width:65, align:"center", sortable:false, formatter:date2Time}, 356 361 {name:'size',index:'size', width:55, align:"right", sortable:false, formatter:bytes2Size} … … 410 415 var tabPanelTemplateId = tabPanelTemplateId.replace(/[\s\/]/g, '-'); 411 416 412 if (selected) { 417 if (selected) { 413 418 if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]) { 414 419 if (!selectedMessages[selectedFolder.id]) … … 418 423 $('#mailpreview-container').unblock(); 419 424 420 var tabPanelTemplateLabel = onceOpenedMessages[selectedFolder.id][message.msg_number].subject;425 var tabPanelTemplateLabel = html_entities(onceOpenedMessages[selectedFolder.id][message.msg_number].subject); 421 426 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3) 422 427 tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...'; … … 433 438 } else { 434 439 jQuery('#mailpreview_container').block({ 435 message: '<div id="loading-content"><div class="image"> 440 message: '<div id="loading-content"><div class="image"></div></div>', 436 441 css: { 437 442 backgroundImage: 'url('+BASE_PATH+'modules/attach_message/images/loading.gif)', … … 469 474 $('#mailpreview_container').unblock(); 470 475 471 var tabPanelTemplateLabel = onceOpenedMessages[selectedFolder.id][message.msg_number].subject;476 var tabPanelTemplateLabel = html_entities(onceOpenedMessages[selectedFolder.id][message.msg_number].subject); 472 477 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3) 473 478 tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...'; … … 481 486 '<div class="mailpreview-message-info">' + 482 487 get_lang('Subject') + ': ' + 483 onceOpenedMessages[selectedFolder.id][message.msg_number].subject+488 html_entities(onceOpenedMessages[selectedFolder.id][message.msg_number].subject) + 484 489 '</div>' 485 490 )
Note: See TracChangeset
for help on using the changeset viewer.