Changeset 5215

Timestamp:

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

Author:

douglasz

Message:

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

Location:

trunk/expressoMail1_2/js

Files:

• draw_api.js (modified) (1 diff)
• globals.js (modified) (1 diff)
• local_messages.js (modified) (1 diff)
• search.js (modified) (3 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -4119 +4119 @@
         if(preferences.use_local_messages==1 && !expresso_offline)
                 if(proxy_mensagens.is_local_folder(current_folder))
-                        span_options.innerHTML += '&nbsp; <span id="localOption" title="'+get_lang("Unarchive")+'" class="message_options" onclick="expresso_local_messages.unarchive_msgs(\''+folder+'\',null)">'+get_lang("Unarchive")+'</span>';
+                        span_options.innerHTML += '&nbsp; <span id="localOption" ' + change_font_color + ' title="'+get_lang("Unarchive")+'" class="message_options" onclick="expresso_local_messages.unarchive_msgs(\''+folder+'\',null)">'+get_lang("Unarchive")+'</span>';
                 else
-                        span_options.innerHTML += '&nbsp; <span id="localOption" title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
+                        span_options.innerHTML += '&nbsp; <span id="localOption" ' + change_font_color + ' title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
         if (use_spam_filter) {
                 if ( current_folder == 'INBOX'+cyrus_delimiter+'Spam' ) {

trunk/expressoMail1_2/js/globals.js

@@ -19 +19 @@
 var toaddress_array = new Array();
 var tree_folders = '';
+var inc_abas_search = 0;
 var folders = new Array();
 //var global_search = 1; // use numBox instead of this!

trunk/expressoMail1_2/js/local_messages.js

@@ -1376 +1376 @@
         filters[0] = sFilter.replace(/##/g,"");
         tmp = filters[0].split("<=>");
-
+        if (tmp[1] == ""){
+                var teste = document.getElementsByName(currentTab);
+                tmp[1] = teste[0].value;
+        }
         searchKey = new Array();
         searchKey.push("SUBJECT");

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);