Changeset 7603 for trunk/expressoMail1_2/js/main.js
- Timestamp:
- 12/04/12 10:44:14 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r7601 r7603 617 617 openTab.imapBox[border_id] = msg_info.msg_folder; 618 618 draw_message(msg_info,border_id); 619 var unseen_sort = document.getElementById('span_flag_UNSEEN').getAttribute('onclick');620 unseen_sort = unseen_sort.toString();621 if ( !(unseen_sort.indexOf("'UNSEEN' == 'UNSEEN'") < 0) )622 {619 // var unseen_sort = document.getElementById('span_flag_UNSEEN').getAttribute('onclick'); 620 // unseen_sort = unseen_sort.toString(); 621 // if ( !(unseen_sort.indexOf("'UNSEEN' == 'UNSEEN'") < 0) ) 622 // { 623 623 // var sort_type = sort_box_type; 624 624 // sort_box_type = null; … … 626 626 // delete selectedPagingMsgs[msg_info.msg_number]; 627 627 // totalFolderMsgs--; 628 }628 // } 629 629 } 630 630 else … … 986 986 } 987 987 988 function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive ){988 function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive, prev_message){ 989 989 if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 990 990 alert( "Impossivel deletar mensagens que ainda estão sendo arquivadas." ); … … 1020 1020 1021 1021 if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 1022 move_msgs2(folder, ""+msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg );1022 move_msgs2(folder, ""+msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg, undefined, prev_message ); 1023 1023 return; 1024 1024 } … … 1073 1073 if (parseInt(preferences.delete_and_show_previous_message) && msg_to_delete) { 1074 1074 if (msg_to_delete.previousSibling){ 1075 var previous_msg = msg_to_delete.previousSibling.id; 1076 $.ajax({ 1077 url: 'controller.php?' + $.param( {action: '$this.imap_functions.get_info_msg', 1078 msg_number: previous_msg, 1079 msg_folder: current_folder, 1080 decoded: true } ), 1081 success: function( data ){ 1082 data = connector.unserialize( data ); 1083 1084 if( data ) 1085 show_msg( data ); 1086 }, 1087 beforeSend: function( jqXHR, settings ){ 1088 connector.showProgressBar(); 1089 }, 1090 complete: function( jqXHR, settings ){ 1091 connector.hideProgressBar(); 1092 } 1093 1094 }); 1075 var previous_msg = prev_message ? prev_message : msg_to_delete.previousSibling.id; 1076 if(previous_msg){ 1077 $.ajax({ 1078 url: 'controller.php?' + $.param( {action: '$this.imap_functions.get_info_msg', 1079 msg_number: previous_msg, 1080 msg_folder: current_folder, 1081 decoded: true } ), 1082 success: function( data ){ 1083 data = connector.unserialize( data ); 1084 1085 if( data ) 1086 show_msg( data ); 1087 }, 1088 beforeSend: function( jqXHR, settings ){ 1089 connector.showProgressBar(); 1090 }, 1091 complete: function( jqXHR, settings ){ 1092 connector.hideProgressBar(); 1093 } 1094 1095 }); 1096 } 1095 1097 } 1096 1098 else{ … … 1299 1301 } 1300 1302 1301 function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg, not_opem_previus ){1303 function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg, not_opem_previus, prev_message){ 1302 1304 not_opem_previus = typeof(not_opem_previus) != 'undefined' ? not_opem_previus : false; 1303 1305 var folder_error = new_folder_name; … … 1343 1345 if (msg_to_delete.previousSibling) 1344 1346 { 1345 var previous_msg = msg_to_delete.previousSibling.id; 1347 var previous_msg = prev_message ? prev_message : msg_to_delete.previousSibling.id; 1348 1346 1349 //cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg); 1347 1350 if(!not_opem_previus){ 1348 $.ajax({ 1349 url: 'controller.php?' + $.param( {action: '$this.imap_functions.get_info_msg', 1350 msg_number: previous_msg, 1351 msg_folder: folder, 1352 decoded: true } ), 1353 success: function( data ){ 1354 data = connector.unserialize( data ); 1355 1356 if( data ) 1357 show_msg( data ); 1358 }, 1359 beforeSend: function( jqXHR, settings ){ 1360 connector.showProgressBar(); 1361 }, 1362 complete: function( jqXHR, settings ){ 1363 connector.hideProgressBar(); 1364 } 1365 }); 1351 if(previous_msg){ 1352 $.ajax({ 1353 url: 'controller.php?' + $.param( {action: '$this.imap_functions.get_info_msg', 1354 msg_number: previous_msg, 1355 msg_folder: folder, 1356 decoded: true } ), 1357 success: function( data ){ 1358 data = connector.unserialize( data ); 1359 1360 if( data ) 1361 show_msg( data ); 1362 }, 1363 beforeSend: function( jqXHR, settings ){ 1364 connector.showProgressBar(); 1365 }, 1366 complete: function( jqXHR, settings ){ 1367 connector.hideProgressBar(); 1368 } 1369 }); 1370 } 1366 1371 } 1367 1372 } … … 1369 1374 else 1370 1375 { 1371 if (current_page > 1) 1376 var border_id = $("#border_id_"+currentTab).prev().attr("id").split("_").slice(2, 3).join("") 1377 var folderName = current_folder; 1378 if(prev_message) 1372 1379 { 1373 $('#msg_opt_previous_'+msg_to_delete.getAttribute('id') + '_r').trigger('click'); 1380 $.ajax({ 1381 url: 'controller.php?' + $.param({ 1382 action: '$this.imap_functions.get_info_msg', 1383 msg_number: prev_message, 1384 msg_folder: folderName, 1385 decoded: true 1386 }), 1387 success: function( data ){ 1388 data = connector.unserialize( data ); 1389 delete_border(currentTab,'false'); 1390 if( data ) 1391 { 1392 show_msg( data ); 1393 } 1394 }, 1395 beforeSend: function( jqXHR, settings ){ 1396 connector.showProgressBar(); 1397 }, 1398 complete: function( jqXHR, settings ){ 1399 connector.hideProgressBar(); 1400 } 1401 }); 1374 1402 } 1375 else 1403 else 1376 1404 { 1377 var border_id = $("#border_id_"+currentTab).prev().attr("id").split("_").slice(2, 3).join("") 1378 var folderName = current_folder; 1379 if(border_id) 1380 { 1381 $.ajax({ 1382 url: 'controller.php?' + $.param({ 1383 action: '$this.imap_functions.get_info_msg', 1384 msg_number: border_id, 1385 msg_folder: folderName, 1386 decoded: true 1387 }), 1388 success: function( data ){ 1389 data = connector.unserialize( data ); 1390 delete_border(currentTab,'false'); 1391 if( data ) 1392 { 1393 show_msg( data ); 1394 } 1395 }, 1396 beforeSend: function( jqXHR, settings ){ 1397 connector.showProgressBar(); 1398 }, 1399 complete: function( jqXHR, settings ){ 1400 connector.hideProgressBar(); 1401 } 1402 }); 1403 } 1404 else 1405 { 1406 delete_border(currentTab,'false'); 1407 } 1405 delete_border(currentTab,'false'); 1408 1406 } 1409 1407 }
Note: See TracChangeset
for help on using the changeset viewer.