Changeset 1342 for branches/1.2/expressoMail1_2/js/search.js

Timestamp:

08/19/09 11:10:14 (15 years ago)

Author:

niltonneto

Message:

Ticket #561 - Correção das diferenças entre versão publicada e branch 1.2

File:

• branches/1.2/expressoMail1_2/js/search.js (modified) (8 diffs)

branches/1.2/expressoMail1_2/js/search.js

@@ -101 +101 @@
                                                      "</tr>"+
                                                      "<tr>"+
-                                                     "<td valign='top'><input type='checkBox' id='check_all_msg' name='check_all_msg'><b>" + get_lang('In all the folders') + "</b></td>"+
+                                                     "<td valign='top'><input type='checkBox' id='check_all_msg' name='check_all_msg' onclick='EsearchE.all_mailboxes()'><b>" + get_lang('In all the folders') + "</b></td>"+
                                                      "</tr>"+
                                                      "</table>"+
@@ -353 +353 @@
                                         if(td1 == "INBOX"){
                                                 var td1  = get_lang("Inbox");
-                                        }
-                                                if(proxy_mensagens.is_local_folder(td1)) {
-                                                        var td1 = this.aux_local_folder_display(td1);
                                         }
                                 }
@@ -497 +494 @@
                 if (span_options)
                         span_options.innerHTML = '<span title="'+get_lang("Delete")+'" style="margin-top:3px;margin-left:8px" class="message_options" onclick="javascript:move_search_msgs(\''+content_search.id+'\');">'+get_lang("Delete")+'</span> | '+
-                                '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindowNew(\"'+content_search.id+'\",\"move_to\",true)>'+get_lang("Move")+'</span>';
+                                '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"'+content_search.id+'\",\"move_to\")>'+get_lang("Move")+'</span>';
                 div_scroll_result.appendChild(table);
                 content_search.appendChild(div_scroll_result);  
@@ -510 +507 @@
                         //set_msg_as_read(msgs_to_set[i], false);
                 }
-                proxy_mensagens.get_msg(uid_msg,mailbox,false,handler_get_msg);
-                /*var args   = "$this.imap_functions.get_info_msg";
-                var params = "msg_number=" + uid_msg + "&msg_folder=" + mailbox;
-                cExecute(args,handler_get_msg,params);*/
+                var args   = "$this.imap_functions.get_info_msg";
+                var params = "&msg_number=" + uid_msg + "&msg_folder=" + mailbox;
+                cExecute(args+params,handler_get_msg);
 
         }
@@ -520 +516 @@
         searchE.prototype.add_mailboxes = function(){
                 var sel = Element("sel_search_nm_box1");
-                if (!proxy_mensagens.is_local_folder(this.name_box_search)) {
-                        var name_box     = this.name_box_search.split(cyrus_delimiter);
-                        if(this.name_box_search == "")
-                                return false;
-                        var name_box_def = "";
-                        if(name_box.length != 1){
-                                name_box_def = name_box[(name_box.length-1)];
-                        }else{
-                                name_box_def = get_lang("Inbox");               
-                        }
-                }
-                else {
-                        if(this.name_box_search=='local_root')
-                                return;
-                        if(this.name_box_search=='local_Inbox')
-                                name_box_def = get_lang("Inbox");
-                        else
-                                name_box_def = this.name_box_search.substr(6);//Retira o 'local_'
+                var name_box     = this.name_box_search.split(cyrus_delimiter);
+                if(this.name_box_search == "")
+                        return false;
+                var name_box_def = "";
+                if(name_box.length != 1){
+                        name_box_def = name_box[(name_box.length-1)];
+                }else{
+                        name_box_def = get_lang("Inbox");               
                 }
                 if( sel.length > 0){
@@ -607 +593 @@
                         return false;
                 }
-                var local_folders = new Array();
-                var temp;
                 
                 if(Element("check_all_msg").checked){
-                        this.all_mailboxes();
                         var nm_box = new Array;
                         for(var i=0; i < EsearchE.all_boxes.length; i++){
                                 nm_box[i] = EsearchE.all_boxes[i] + fields;
-                        }
-                        if (preferences.use_local_messages == 1) {
-                                temp = expresso_local_messages.list_local_folders();
-                                for (var x in temp) {
-                                        local_folders.push(temp[x][0]);
-                                }
                         }
                 }else{
@@ -635 +612 @@
                         for(var i=0; i < sel_combo.options.length; i++){
                                 if(sel_combo.options[i].selected == true){
-                                        if(!proxy_mensagens.is_local_folder(sel_combo.options[i].value))
-                                                nm_box[nm_box.length] = sel_combo.options[i].value + fields;
-                                        else
-                                                local_folders.push(sel_combo.options[i].value.substr(6));
+                                        nm_box[nm_box.length] = sel_combo.options[i].value + fields;
                                 }
                         }
                 }
                 var handler = function(data){
-                        var tmp;
-                        var countTmp= new Array();
-                        if (local_folders.length > 0) {
-                                tmp = expresso_local_messages.search(local_folders, fields);
-                                if (tmp!=false) {
-                                        var tmp2 = tmp.substr(2, data.length - 4);
-                                        countTmp = tmp.split('####');
-                                }
-                        }
-                        if((data == "none") && (countTmp.length==0)){alert(get_lang("None result was found."));}
-                        else if(countTmp.length > 50){alert(get_lang("More than %1 results. Please, try to refine your search.",50));}
+                        if(data == "none"){alert(get_lang("None result was found."));}
                         else if(data == "many results"){alert(get_lang("More than %1 results. Please, try to refine your search.",50));}
-                        else{EsearchE.mount_result((data=='none')?tmp:(countTmp.length==0)?data:data+tmp);}
+                        else{EsearchE.mount_result(data);}
                 }
                 var args   = "$this.imap_functions.search_msg";
@@ -715 +679 @@
                 win.open();     
         }
-        
-        searchE.prototype.aux_local_folder_display = function(folder) {
-                return "(Local) " + lang_folder(folder.substr(6));
-        }
-        
 // Cria o objeto
         var EsearchE;