Changeset 7481
- Timestamp:
- 10/30/12 16:14:36 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r7477 r7481 454 454 folderName = folderName.replace(/=/gi, ''); 455 455 delete_border(msg_num+'_r_'+folderName,'false'); //close email tab 456 } 456 457 } 457 458 }; 458 459 if (confirm(get_lang("delete all attachments confirmation"))) … … 530 531 531 532 function show_msg(msg_info){ 533 console.log(msg_info); 532 534 if(!verify_session(msg_info)) 533 535 return; … … 606 608 607 609 if(msg_info.alarm == false){ 608 if ((openTab.type[currentTab] == 2 || openTab.type[currentTab] == 3) && isPartMsg === false) 609 delete_border(currentTab,'false'); 610 if ((openTab.type[currentTab] == 2 || openTab.type[currentTab] == 3) && isPartMsg === false){ 611 delete_border(currentTab,'false'); 612 } 613 610 614 } 611 615 … … 985 989 986 990 function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){ 987 991 if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 988 992 alert( "Impossivel deletar mensagens que estão ainda estão sendo arquivadas." ); 989 993 return; … … 1092 1096 }); 1093 1097 } 1094 else 1095 delete_border(currentTab,'false'); 1096 } 1097 else 1098 delete_border(currentTab,'false'); 1098 else{ 1099 delete_border(currentTab,'false'); 1100 } 1101 1102 } 1103 else{ 1104 delete_border(currentTab,'false'); 1105 } 1106 1099 1107 } 1100 1108 for (var i=0; i<data.msgs_number.length; i++){ … … 1111 1119 if ($("#"+tabToRemove)){ 1112 1120 delete_border(tabToRemove,'false'); 1121 var border_id = create_border(msg_info.subject, id_msg_read); 1122 if(border_id) 1123 { 1124 openTab.type[border_id] = 2; 1125 openTab.imapBox[border_id] = msg_info.msg_folder; 1126 draw_message(msg_info,border_id); 1127 var unseen_sort = document.getElementById('span_flag_UNSEEN').getAttribute('onclick'); 1128 unseen_sort = unseen_sort.toString(); 1129 if ( !(unseen_sort.indexOf("'UNSEEN' == 'UNSEEN'") < 0) ) 1130 { 1131 var sort_type = sort_box_type; 1132 sort_box_type = null; 1133 sort_box('UNSEEN', sort_type,false); 1134 delete selectedPagingMsgs[msg_info.msg_number]; 1135 totalFolderMsgs--; 1136 } 1137 } 1113 1138 } 1114 1139 }); … … 1368 1393 $('#msg_opt_previous_'+msg_to_delete.getAttribute('id') + '_r').trigger('click'); 1369 1394 } 1370 else 1371 delete_border(currentTab,'false'); 1395 else{ 1396 1397 var border_id = $("#tbody_box").find("tr:eq(1)").attr("id"); 1398 var folderName = current_folder; 1399 if(border_id){ 1400 $.ajax({ 1401 url: 'controller.php?' + $.param( {action: '$this.imap_functions.get_info_msg', 1402 msg_number: border_id, 1403 msg_folder: folderName, 1404 decoded: true } ), 1405 success: function( data ){ 1406 data = connector.unserialize( data ); 1407 1408 delete_border(currentTab,'false'); 1409 1410 if( data ) 1411 show_msg( data ); 1412 }, 1413 beforeSend: function( jqXHR, settings ){ 1414 connector.showProgressBar(); 1415 }, 1416 complete: function( jqXHR, settings ){ 1417 connector.hideProgressBar(); 1418 } 1419 }); 1420 } else { 1421 delete_border(currentTab,'false'); 1422 } 1423 1424 } 1425 1372 1426 } 1373 1427 else{ … … 1438 1492 show_msg(data.previous_msg); 1439 1493 } 1440 else 1441 delete_border(data.border_ID,'false'); 1494 else{ 1495 delete_border(data.border_ID,'false'); 1496 } 1497 1442 1498 } 1443 1499 if(folder == get_current_folder()){ … … 1558 1614 tabToRemove = value + "_r_" + msgFolder.replace(/=/g,""); 1559 1615 if ($("#"+tabToRemove)){ 1560 delete_border(tabToRemove,'false');1616 //delete_border(tabToRemove,'false'); 1561 1617 } 1562 1618 });
Note: See TracChangeset
for help on using the changeset viewer.