Changeset 5215 for trunk/expressoMail1_2/js/search.js

Timestamp:

11/29/11 10:16:17 (12 years ago)

Author:

douglasz

Message:

Ticket #2349 - Problemas ao efetuar uma pesquisa rapida com arquivamentos locais

File:

• trunk/expressoMail1_2/js/search.js (modified) (3 diffs)

trunk/expressoMail1_2/js/search.js

@@ -394 +394 @@
                 
                         if ( local_folders.length > 0 ){
+                                                        var currentSearch = document.getElementsByName(currentTab);
                             expresso_local_messages.setSortType(sortType);
-                            gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() );
+                            gears = expresso_local_messages.search( local_folders, "##ALL <=>"+currentSearch[0].value +"##" );
                         }
                 }
@@ -442 +443 @@
                         }
 
-                        if ( local_folders.length > 0 )
-                                gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() );
+                        if ( local_folders.length > 0 ){
+                                var currentSearch = document.getElementsByName(currentTab);
+                                gears = expresso_local_messages.search( local_folders, "##ALL <=>"+currentSearch[0].value +"##");
+                        }
 
                         data['data_gears']      = gears;
                         data['num_msgs']        = gears.length;
         
-                write_msg( data['num_msgs'] + " " + get_lang("results found") );
-                        
+                        if(data['num_msgs'] != undefined)
+                                write_msg( data['num_msgs'] + " " + get_lang("results found") );
+                                                
                         EsearchE.mount_result( data, 'SORTDATE' );
                 }
@@ -665 +669 @@
                                 var aux = numBox.split("_");
                                 numBox = parseInt(aux[0]) + 1;
-                        }else
-                        numBox++;
-
+                        }else{
+                                inc_abas_search++;
+                                numBox = inc_abas_search;
+                        }
                         if( Data['data'] )
                                 var border_id = create_border(get_lang("Server Results"), "search_" + numBox);