Changeset 4650 for branches/2.2.0.1/expressoMail1_2/js
- Timestamp:
- 07/01/11 17:52:41 (13 years ago)
- Location:
- branches/2.2.0.1/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/expressoMail1_2/js/local_messages.js
r4647 r4650 8 8 this.store = null; 9 9 this.filterSerch = ""; 10 this.sortType = ""; 10 11 } 11 12 … … 118 119 119 120 } 120 121 121 122 local_messages.prototype.installGears = function (){ 122 123 temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to install it now?")); … … 926 927 } 927 928 929 local_messages.prototype.setSortType = function (sortType){ 930 this.sortType = sortType; 931 } 932 933 local_messages.prototype.getSortType = function (){ 934 if (this.sortType == "") 935 { 936 return 'SORTDATE'; 937 } 938 return this.sortType; 939 } 940 928 941 local_messages.prototype.search = function(folders,sFilter) { 929 942 this.init_local_messages(); … … 1003 1016 } 1004 1017 sql += ")"; 1018 1019 // Sort 1020 if (this.getSortType().match('^SORTDATE.*')){ 1021 sql += " order by mail.timestamp"; 1022 } 1023 else if (this.getSortType().match('^SORTWHO.*')){ 1024 sql += " order by mail.ffrom"; 1025 } 1026 else if (this.getSortType().match('^SORTSUBJECT.*')){ 1027 sql += " order by mail.subject"; 1028 } 1029 else if (this.getSortType().match('^SORTSIZE.*')){ 1030 sql += " order by mail.size"; 1031 } 1032 else if (this.getSortType().match('^SORTBOX.*')){ 1033 sql += " order by folder.folder"; 1034 } 1035 1036 sql += this.getSortType().match('^.*_REVERSE$') ? ' asc' : ' desc'; 1037 1005 1038 var rs = this.dbGears.execute(sql); 1006 1039 var retorno = []; -
branches/2.2.0.1/expressoMail1_2/js/search.js
r4640 r4650 292 292 var sort_type = sortType; 293 293 294 294 var is_local = border_id.match('.*_local_.*'); 295 295 296 var args = "$this.imap_functions.search_msg"; 296 297 var params = "condition="+EsearchE.condition+"&page="+EsearchE.page+"&sort_type="+sort_type; … … 302 303 var local_folders = []; 303 304 304 if ( preferences.use_local_messages == 1 )305 if ( preferences.use_local_messages == 1 && is_local) 305 306 { 306 307 temp = expresso_local_messages.list_local_folders(); … … 312 313 313 314 314 if ( local_folders.length > 0 ) 315 gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() ); 315 if ( local_folders.length > 0 ){ 316 expresso_local_messages.setSortType(sortType); 317 gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() ); 318 } 316 319 } 317 320 318 if( data['num_msgs'] 321 if( data['num_msgs']) 319 322 { 320 323 allMsg['data'] = data['data']; 321 324 allMsg['num_msgs'] = data['num_msgs']; 322 allMsg['gears_num_msgs'] = gears.length; 325 326 } 327 328 if (gears.length > 0) 329 { 330 allMsg['data_gears'] = gears; 323 331 } 324 332 … … 327 335 EsearchE.mount_result( allMsg , sort_type ); 328 336 }; 329 cExecute(args,handler,params); 337 338 if (is_local) 339 { 340 eval("handler('none')"); 341 } 342 else 343 { 344 cExecute(args,handler,params); 345 } 330 346 } 331 347 … … 354 370 write_msg( data['num_msgs'] + " " + get_lang("results found") ); 355 371 356 EsearchE.mount_result( data );372 EsearchE.mount_result( data, 'SORTDATE' ); 357 373 } 358 374 } … … 669 685 else 670 686 { 671 td_element1.innerHTML = "<b>"+get_lang("Folder")+"</b>"; 687 td_element1.onclick = function(){ EsearchE.searchFor(border_id, 'SORTBOX_REVERSE'); }; 688 td_element1.innerHTML = "<b>"+get_lang("Folder")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 672 689 } 673 690 } … … 680 697 else 681 698 { 682 //alert('Ordenando localMessage');699 td_element1.onclick = function(){ EsearchE.searchFor(border_id, 'SORTBOX'); }; 683 700 } 684 701 td_element1.innerHTML = ( sort_type == 'SORTBOX_REVERSE' ) ? arrow_ascendant(get_lang("Folder")) : get_lang("Folder"); … … 697 714 else 698 715 { 699 td_element2.innerHTML = "<b>"+get_lang("who")+"</b>"; 716 td_element2.onclick = function(){ EsearchE.searchFor(border_id, 'SORTWHO_REVERSE'); }; 717 td_element2.innerHTML = "<b>"+get_lang("who")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 700 718 } 701 719 } … … 708 726 else 709 727 { 710 //alert('Ordenando localMessage');728 td_element2.onclick = function(){ EsearchE.searchFor(border_id, 'SORTWHO'); }; 711 729 } 712 730 td_element2.innerHTML = ( sort_type == 'SORTWHO_REVERSE' ) ? arrow_ascendant(get_lang("who")) : get_lang("who"); … … 725 743 else 726 744 { 727 td_element3.innerHTML = "<b>"+get_lang("subject")+"</b>"; 745 td_element3.onclick = function(){ EsearchE.searchFor(border_id, 'SORTSUBJECT_REVERSE'); }; 746 td_element3.innerHTML = "<b>"+get_lang("subject")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 728 747 } 729 748 } … … 736 755 else 737 756 { 738 //alert('Ordenando localMessage');757 td_element3.onclick = function(){ EsearchE.searchFor(border_id, 'SORTSUBJECT'); }; 739 758 } 740 759 td_element3.innerHTML = ( sort_type == 'SORTSUBJECT_REVERSE' ) ? arrow_ascendant(get_lang("subject")) : get_lang("subject"); … … 753 772 else 754 773 { 755 td_element4.innerHTML = "<b>"+get_lang("Date")+"</b>"; 774 td_element4.onclick = function(){ EsearchE.searchFor(border_id, 'SORTDATE_REVERSE'); }; 775 td_element4.innerHTML = "<b>"+get_lang("Date")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 756 776 } 757 777 } … … 764 784 else 765 785 { 766 //alert('Ordenando localMessage');786 td_element4.onclick = function(){ EsearchE.searchFor(border_id, 'SORTDATE'); }; 767 787 } 768 788 td_element4.innerHTML = ( sort_type == 'SORTDATE_REVERSE' ) ? arrow_ascendant(get_lang("Date")) : get_lang("Date"); … … 781 801 else 782 802 { 783 td_element5.innerHTML = "<b>"+get_lang("size")+"</b>"; 803 td_element5.onclick = function(){ EsearchE.searchFor(border_id, 'SORTSIZE_REVERSE'); }; 804 td_element5.innerHTML = "<b>"+get_lang("size")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 784 805 } 785 806 } … … 792 813 else 793 814 { 794 //alert('Ordenando localMessage');815 td_element5.onclick = function(){ EsearchE.searchFor(border_id, 'SORTSIZE'); }; 795 816 } 796 817 td_element5.innerHTML = ( sort_type == 'SORTSIZE_REVERSE' ) ? arrow_ascendant(get_lang("size")) : get_lang("size"); … … 1121 1142 1122 1143 // Gears - local 1123 if ( local_folders.length > 0 ) 1124 tmp = expresso_local_messages.search( local_folders, fields ); 1144 if ( local_folders.length > 0 ){ 1145 expresso_local_messages.setSortType('SORTDATE'); 1146 tmp = expresso_local_messages.search( local_folders, fields ); 1147 } 1125 1148 1126 1149 if( data['num_msgs'] )
Note: See TracChangeset
for help on using the changeset viewer.