- Timestamp:
- 07/20/12 15:40:15 (12 years ago)
- Location:
- sandbox/2.4.2-expresso2/expressoMail1_2/js
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js
r6837 r6841 523 523 var handler_draw_box = function(data) 524 524 { 525 525 526 if(!verify_session(data)) 526 527 return; … … 1496 1497 //helper: 'clone', 1497 1498 helper: function(event){ 1498 $(this).find("input:checkbox").attr("checked", true); 1499 $(this).addClass("selected_msg").find("input:checkbox").attr("checked", true); 1500 updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id")); 1499 1501 if ( $("#tbody_box .selected_shortcut_msg").length > 1) { 1500 $("#tbody_box .selected_shortcut_msg").find('.checkbox').attr('checked',true); 1502 $("#tbody_box .selected_shortcut_msg").addClass("selected_msg").find('.checkbox').attr('checked',true); 1503 $.each( $(".selected_shortcut_msg"), function(index, value){ 1504 updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id")); 1505 }); 1501 1506 } 1507 1502 1508 if($("#table_box").find("tr input:checked").length > 1 ) 1503 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : ( ($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})+"</td></tr>");1509 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>"); 1504 1510 if( $(this).find(".td_msg_subject").text().length > 18 ) 1505 1511 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})+"</td></tr>"); … … 1513 1519 containment: "#divAppbox" 1514 1520 }).bind('contextmenu',function(event){ 1515 if (!(($(event.target).find('img').length > 0) && ($(event.target).hasClass('td-label')))){ 1516 if($(this).find("input:checkbox").attr("checked") != "checked"){ 1517 $(this).find("input:checkbox").trigger('click'); 1518 $(this).addClass("selected_msg"); 1519 } 1521 if (!(($(event.target).find('img').length > 0) && ($(event.target).hasClass('td-label')))){ 1522 if($(this).find("input:checkbox").attr("checked") != "checked"){ 1523 $(this).find("input:checkbox").trigger('click'); 1524 $(this).addClass("selected_msg"); 1520 1525 } 1526 updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id")); 1527 } 1521 1528 }); 1522 1529 } -
sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js
r6822 r6841 672 672 }, 673 673 helper: function(event){ 674 if($(this).find("input:checkbox").attr("checked") != "checked"){ 675 $(this).find("input:checkbox").trigger('click'); 676 $(this).addClass("selected_msg"); 677 } 678 if($("#table_box").find("tr input:checked").length > 1) 679 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})+"</td></tr>"); 680 if( $(this).find(".td_msg_subject").text().length > 18 ) 681 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})+"</td></tr>"); 682 else 683 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"})+"</td></tr>"); 674 $(this).addClass("selected_msg").find("input:checkbox").attr("checked", true); 675 updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id")); 676 if ( $("#tbody_box .selected_shortcut_msg").length > 1) { 677 $("#tbody_box .selected_shortcut_msg").addClass("selected_msg").find('.checkbox').attr('checked',true); 678 $.each( $(".selected_shortcut_msg"), function(index, value){ 679 updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id")); 680 }); 681 } 682 if($("#table_box").find("tr input:checked").length > 1) 683 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>"); 684 if( $(this).find(".td_msg_subject").text().length > 18 ) 685 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})+"</td></tr>"); 686 else 687 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"})+"</td></tr>"); 684 688 }, 685 689 iframeFix: true, … … 689 693 containment: "#divAppbox" 690 694 }).bind("contextmenu", function(){ 691 if($(this).find("input:checkbox").attr("checked") != "checked"){ 692 $(this).find("input:checkbox").trigger('click'); 693 $(this).addClass("selected_msg"); 695 if (!(($(event.target).find('img').length > 0) && ($(event.target).hasClass('td-label')))){ 696 if($(this).find("input:checkbox").attr("checked") != "checked"){ 697 $(this).find("input:checkbox").trigger('click'); 698 $(this).addClass("selected_msg"); 699 } 700 updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id")); 694 701 } 695 702 }); … … 814 821 815 822 if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 816 var msgs = new Array(); 817 var i = 0; 818 $.each(selectedMessages, function(index, value){ 819 if(value) 820 msgs[i++] = index; 821 }); 822 msgs_number = msgs.join(); 823 move_msgs2(folder, msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg ); 823 if(currentTab == 0) 824 msgs_number = get_selected_messages(); 825 move_msgs2(folder, ""+msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg ); 824 826 return; 825 827 } … … 892 894 } 893 895 894 if (msgs_number == 'selected')895 msgs_number = get_selected_messages(); 896 msgs_number = get_selected_messages(); 897 896 898 if (msgs_number.length > 0 || parseInt(msgs_number) > 0) 897 899 cExecute ("$this.imap_functions.delete_msgs&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_delete_msgs); … … 1056 1058 params += "&new_folder="+url_encode(new_folder); 1057 1059 params += "&new_folder_name="+url_encode(new_folder_name); 1058 cExecute ("$this.imap_functions.move_search_messages", handler_move_search_msgs, params);1059 }1060 cExecute ("$this.imap_functions.move_search_messages", handler_move_search_msgs, params); 1061 } 1060 1062 } 1061 1063 else … … 1228 1230 } catch (e) {} 1229 1231 1230 if (msgs_number == 'selected'){1232 if(currentTab == 0) 1231 1233 msgs_number = get_selected_messages(); 1232 }1233 1234 1234 1235 if(openTab.type[currentTab] == 1){ … … 1252 1253 url: 'controller.php?' + $.param( {action: '$this.imap_functions.move_messages', 1253 1254 folder: folder, 1254 msgs_number: msgs_number,1255 msgs_number: ""+msgs_number, 1255 1256 border_ID: border_ID, 1256 1257 sort_box_type: sort_box_type, … … 1265 1266 success: function( data ){ 1266 1267 data = connector.unserialize( data ); 1267 1268 $.each(msgs_number, function(index, value){ 1269 delete selectedPagingMsgs[value]; 1270 }); 1271 totalFolderMsgs -= totalSelected(); 1272 1273 //TESTE 1274 selectAllFolderMsgs(); 1275 $('.select-link').unbind('click'); 1276 1268 1277 if( data ) 1269 1278 handler_move_msgs( data ); … … 1613 1622 } 1614 1623 1615 function get_selected_messages(){1624 /*function get_selected_messages(){ 1616 1625 var main; 1617 1626 try{ … … 1657 1666 1658 1667 1659 /* Verifica se está na tela de pesquisa. */ 1668 /* Verifica se está na tela de pesquisa. */ /* 1660 1669 if(selected_messages.indexOf("_") != -1) 1661 1670 { 1662 1671 results_search_messages = selected_messages; 1663 /* Retira a informação da aba */ 1672 /* Retira a informação da aba */ /* 1664 1673 selected_messages = selected_messages.substring(0,selected_messages.indexOf("_")); 1665 1674 } … … 1677 1686 return selected_messages_by_shortcuts; 1678 1687 }*/ 1679 /*Se houver mais de uma mensagem selecionada por atalho*/ 1688 /*Se houver mais de uma mensagem selecionada por atalho*//* 1680 1689 if (array_selected_messages_by_shortcuts.length > 1){ 1681 1690 if (selected_messages == "") … … 1689 1698 else 1690 1699 return selected_messages; 1700 }*/ 1701 function get_selected_messages(){ 1702 var selected = new Array(); 1703 $.each(selectedPagingMsgs, function(index, value){ 1704 if(value) 1705 selected.push(index); 1706 }); 1707 return ""+selected; 1691 1708 } 1692 1709 … … 3160 3177 success: function( data ){ 3161 3178 data = connector.unserialize( data ); 3162 3179 3180 selectAllFolderMsgs(); 3181 $('.select-link').unbind('click'); 3182 3163 3183 if( data ) 3164 3184 handler_set_messages_flag( data ); … … 3675 3695 msgs_number = get_selected_messages(); 3676 3696 3697 //TODO: REFATORAR O CÓDIGO PARA EVITAR recodificação 3698 if(currentTab == 0) 3699 msgs_number = get_selected_messages(); 3700 3677 3701 if (parseInt(msgs_number) > 0 || msgs_number.length > 0) 3678 3702 cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=false"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+0+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs); … … 3712 3736 return; 3713 3737 }else if(msgs_number == 'selected') 3738 msgs_number = get_selected_messages(); 3739 3740 //TODO: REFATORAR O CÓDIGO PARA EVITAR recodificação 3741 if(currentTab == 0) 3714 3742 msgs_number = get_selected_messages(); 3715 3743 -
sandbox/2.4.2-expresso2/expressoMail1_2/js/shortcut.js
r6823 r6841 273 273 delete_border(get_msg_id(), 'false'); 274 274 },{'disable_in_input':false}); 275 /* 275 276 276 shortcut.add("I",function(){print_all();},{'disable_in_input':true}); 277 277 shortcut.add("E",function(e){ if(e.preventDefault) e.preventDefault(); else event.returnValue = false; exec_msg_action('forward');},{'disable_in_input':true}); … … 280 280 shortcut.add("O",function(e){ if(e.preventDefault) e.preventDefault(); else event.returnValue = false; show_head_option();},{'disable_in_input':true}); 281 281 shortcut.add("M",function(e){ if(e.preventDefault) e.preventDefault(); else event.returnValue = false; show_address_full();},{'disable_in_input':true}); 282 */ 282 283 283 shortcut.add("Delete",function(){ 284 284 … … 319 319 ,{'disable_in_input':true}); 320 320 321 //shortcut.add("Ctrl+Up",function(){exec_msg_action('previous');/*select_msg('null', 'up');*/},{'disable_in_input':true});322 //shortcut.add("Ctrl+Down",function(){exec_msg_action('next');/*select_msg('null', 'down');*/},{'disable_in_input':true});321 shortcut.add("Ctrl+Up",function(){exec_msg_action('previous');/*select_msg('null', 'up');*/},{'disable_in_input':true}); 322 shortcut.add("Ctrl+Down",function(){exec_msg_action('next');/*select_msg('null', 'down');*/},{'disable_in_input':true}); 323 323 324 324 if (is_ie || is_webkit)
Note: See TracChangeset
for help on using the changeset viewer.