Changeset 5777
- Timestamp:
- 03/21/12 16:34:08 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/attach_message/attach_message.js
r5760 r5777 114 114 }; 115 115 for(var flag in cell){ 116 classes += '<span class="flags '+ (cell[flag]) .toLowerCase() +((cell[flag]) == '' ? '"' : '" title="'+ get_lang((cell[flag])))+'"> </span>';117 } 118 116 classes += '<span class="flags '+ (cell[flag]) +'" title="'+ (cell[flag]) +'"> </span>'; 117 } 118 119 119 if(rowObject.labels){ 120 120 classes += '<span class="flags labeled"> </span>'; … … 122 122 classes += '<span class="flags"> </span>'; 123 123 } 124 124 125 if(rowObject.followupflagged){ 125 if(rowObject.followupflagged.followupflag.id < 7){ 126 var nameFollowupflag = get_lang(rowObject.followupflagged.followupflag.name); 127 }else{ 128 var nameFollowupflag = rowObject.followupflagged.followupflag.name; 129 } 130 classes += '<span class="flags followupflagged" title="'+nameFollowupflag+'" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>'; 126 classes += '<span class="flags followupflagged" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>'; 131 127 } 132 128 return classes; … … 337 333 colModel:[ 338 334 {name:'msg_number',index:'msg_number', width:45, hidden:true, sortable:false}, 339 {name:'flags',index:'msg_number',edittype: 'image', width:100, sortable:false, formatter:flags2Class , title :false},335 {name:'flags',index:'msg_number',edittype: 'image', width:100, sortable:false, formatter:flags2Class}, 340 336 {name:'from.name',index:'msg_number', width:70, sortable:false, formatter:NormaliseFrom}, 341 337 {name:'subject',index:'subject', width:245, sortable:false}, 342 338 {name:'timestamp',index:'timestamp', width:65, align:"center", sortable:false, formatter:date2Time}, 343 {name:'size',index:'size', width:55, align:"right", sortable:false, formatter:bytes2Size} 339 {name:'size',index:'size', width:55, align:"right", sortable:false, formatter:bytes2Size} 344 340 ], 345 341 jsonReader : { … … 395 391 396 392 var tabPanelTemplateId = 'mailpreview_tab_' + selectedFolder.id.replace(/[.\/]/, '_') + '_' + message.msg_number; 397 398 if (selected) { 393 var tabPanelTemplateId = tabPanelTemplateId.replace(/[\s\/]/g, '-'); 394 395 if (selected) { 396 399 397 if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]) { 398 400 399 if (!selectedMessages[selectedFolder.id]) 401 400 selectedMessages[selectedFolder.id] = {}; … … 407 406 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3) 408 407 tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...'; 409 410 if (!$('#' + tabPanelTemplateId).length) { 408 409 410 if (!$('#' + tabPanelTemplateId).length) { 411 411 412 $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel) 412 413 .find('.message.empty-container').hide().end() … … 442 443 if (!selectedMessages[selectedFolder.id]) 443 444 selectedMessages[selectedFolder.id] = {}; 444 selectedMessages[selectedFolder.id][message.msg_number] = true; 445 selectedMessages[selectedFolder.id][message.msg_number] = true; 445 446 $.ajax({ 446 447 accepts: 'text/html', 447 448 url: BASE_PATH + 'REST.php'+offlineCase+'?q=folder/'+selectedFolder.id.replace(dashes, '.')+'/message/'+id, 448 449 dataType: 'json', 449 success: function( mail_preview ){ 450 //selectedMessagesCount();450 success: function( mail_preview ){ 451 451 452 if (!onceOpenedMessages[selectedFolder.id]) 452 453 onceOpenedMessages[selectedFolder.id] = {}; 453 454 onceOpenedMessages[selectedFolder.id][message.msg_number] = jQuery.extend(true, message, mail_preview); 454 455 455 $('#mailpreview_container').unblock(); 456 457 456 var tabPanelTemplateLabel = onceOpenedMessages[selectedFolder.id][message.msg_number].subject; 457 selectedMessagesCount(); 458 458 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3) 459 459 tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...'; 460 461 if (!$('#' + tabPanelTemplateId).length) { 460 if (!$('#' + tabPanelTemplateId).length) { 462 461 $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel) 463 462 .find('.message.empty-container').hide().end() … … 470 469 ) 471 470 .find('[class^="ExpressoCssWrapper"]').addClass("mailpreview-message-body"); 471 472 472 } else { 473 473 $mailpreview_tabs.tabs('select', '#' + tabPanelTemplateId) 474 474 .find('#' + tabPanelTemplateId + ', [href="#' + tabPanelTemplateId + '"]').removeClass('preview-message-unselected'); 475 } 476 selectedMessagesCount(); 475 } 477 476 } 478 477 }); … … 493 492 } 494 493 495 if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]) 494 if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]){ 496 495 selectedMessagesCount(); 496 } 497 497 }, 498 498 caption: '<span class="'+selectedFolder['class']+'">'+selectedFolder.name+'</span>'
Note: See TracChangeset
for help on using the changeset viewer.