Changeset 3033


Ignore:
Timestamp:
07/12/10 11:43:45 (10 years ago)
Author:
amuller
Message:

Ticket #1135 - Retirando código que foi perdido no merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/expressoMail1_2/js/search.js

    r3018 r3033  
    260260                if(data.length > 0 && showMsg)  
    261261                                write_msg(data.length + " "+ get_lang('results found'));  
    262                 /* This code was lost on merge  
    263                 if( (preferences.search_result_number != '65536') && (nw_array.length > 0) && (nw_array.length >= preferences.search_result_number) ){ 
    264                     nw_array.length = preferences.search_result_number; 
    265                     write_msg(get_lang("More than %1 results. Please, try to refine your search.",preferences.search_result_number)); 
    266                 } 
    267                 else { 
    268                         write_msg(nw_array.length + " "+ get_lang('results found')); 
    269                 } 
    270                 */ 
    271262 
    272263                numBox++; 
     
    811802                                }  
    812803                                if((data == "none") || (data.length==0)){alert(get_lang("None result was found."));}  
    813                                 else if(data.length > 1000){alert(get_lang("More than %1 results. Please, try to refine your search.",1000));} 
    814                         else if(data == "many results"){alert(get_lang("More than %1 results. Please, try to refine your search.",50));}  
     804                                else if(data.length > preferences.search_result_number){alert(get_lang("More than %1 results. Please, try to refine your search.",1000));} 
     805                        else if(data == "many results"){alert(get_lang("More than %1 results. Please, try to refine your search.",preferences.search_result_number));}  
    815806                        else{EsearchE.mount_result(data);} 
    816  
    817                         /* Lost code on merge 
    818                         if ((sumResults == "none") && (countTmp.length==0)){ 
    819                             alert(get_lang("None result was found.")); 
    820                         } 
    821                         else 
    822                         { 
    823                             EsearchE.mount_result((sumResults=='none')?tmp:(countTmp.length==0)?data:data+tmp); 
    824                         }*/ 
    825807 
    826808                } 
Note: See TracChangeset for help on using the changeset viewer.