Changeset 4900 for branches/2.3/expressoMail1_2/js/search.js

Timestamp:

08/03/11 17:40:31 (13 years ago)

Author:

brunocosta

Message:

Ticket #2162 - Evitando buscas no arquivamento local quando se pagina e não existem resultados locais.

File:

• branches/2.3/expressoMail1_2/js/search.js (modified) (6 diffs)

branches/2.3/expressoMail1_2/js/search.js

@@ -16 +16 @@
                 this.txtfields          = new Array("txt_ass","txt_de","txt_body","txt_para","txt_cc","txt_cco", "since_date", "before_date", "on_date");
                 this.selectFields       = new Array("flagged", "seen", "answered", "recent");
+                this.localResults   = 0;
         }
 
@@ -226 +227 @@
 
         // Gears - local
-                if ( preferences.use_local_messages == 1 )
+                if (preferences.use_local_messages == 1 && EsearchE.localResults != 0)
                 {
                         temp = expresso_local_messages.list_local_folders();
@@ -233 +234 @@
                                 local_folders.push(temp[x][0]);
                         }
-                }
-                
-                if ( local_folders.length > 0 )
+                    if ( local_folders.length > 0 )
                         _gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() );
+                        _data['gears_num_msgs'] = _gears.length;
+                }else{
+                    _data['gears_num_msgs']     = 0;
+                }
 
                 _data['data']                   = data['data'];
                 _data['num_msgs']               = data['num_msgs'];
-                _data['gears_num_msgs'] = _gears.length;
+                
 
                 delete_border( data['currentTab'], false);
@@ -393 +396 @@
             if (gears.length > 0)
             {
+                this.localResults = gears.length;
                 allMsg['data_gears']                    = gears;
+            }else{
+                 this.localResults = 0;
             }
                 
@@ -1234 +1240 @@
                 }
                 var count = data['num_msgs'] ?  data['num_msgs'] : tmp.length > 0 ? tmp.length : "0";
-
+                 EsearchE.localResults = tmp.length;
                 if( data['num_msgs'] )
                 {
@@ -1256 +1262 @@
                         allMsg['data_gears'] = tmp;
                     }
-
-                    write_msg( count + " " + get_lang("results found") );
+                   
+                     write_msg( count + " " + get_lang("results found") );
                     EsearchE.mount_result( allMsg, 'SORTDATE' );
                 }
+
             }