Changeset 5200 for trunk/expressoMail1_2/js/abas.js

Timestamp:

11/23/11 14:52:28 (12 years ago)

Author:

douglasz

Message:

Ticket #2340 - Pesquisa rapida - Inconsistencia ao abrir resultados no arquivamento local

File:

• trunk/expressoMail1_2/js/abas.js (modified) (2 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -47 +47 @@
         if (footer_menu != null) {
                 footer_menu.style.display = (openTab.type[ID] != 4 ? '' : 'none');
-                if((aba.id.indexOf("_r") < 0) && (aba.id.indexOf("_0") < 0) && (aba.id.indexOf("id_search_") < 0)){
+                var alternate_menu = document.getElementById('localOption');
+                if(alternate_menu != null && alternate_menu != 'undefined'){ //Quando Carregado o expresso mail
+                        if(openTab.imapBox[ID]!= null && openTab.imapBox[ID]!= 'undefined' ){ //Quando abrir uma Nova Mensagem
+                                if((openTab.imapBox[ID].indexOf("local_") >= 0)){                                               
+                                                alternate_menu.title = get_lang("Unarchive");
+                                                alternate_menu.removeAttribute("onclick");
+                                                alternate_menu.setAttribute("onclick",  'expresso_local_messages.unarchive_msgs(\''+openTab.imapBox[ID]+'\', null)');
+                                                alternate_menu.innerHTML = get_lang("Unarchive");
+                                                
+                                        }else{
+                                                alternate_menu.title = get_lang("Archive");
+                                                alternate_menu.removeAttribute("onclick");
+                                                alternate_menu.setAttribute("onclick", 'archive_msgs(\''+openTab.imapBox[ID]+'\', null)');                              
+                                                alternate_menu.innerHTML = get_lang("Archive");
+                                        }
+                        }
+                }
+                if((aba.id.indexOf("_r") < 0) && (aba.id.indexOf("_0") < 0) && (aba.id.indexOf("id_search_") < 0) && (aba.id.indexOf("_s") < 0)){
                         spanD.style.display = 'none';
                         footer_menu.style.display = 'none';                     
@@ -167 +184 @@
                 
                 var ID = id_value;
-                openTab.imapBox[ID] = current_folder;
+                if((currentTab != 0) && (currentTab.indexOf("search") >= 0) && (ID.indexOf("msg") < 0)) {
+                        var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
+                        ID_TR = ID.toString().substr(0,ID.toString().indexOf("_r"));
+                        var tr = Element(ID_TR);
+                        openTab.imapBox[ID] = (tr.getAttribute('name') == null?get_current_folder():tr.getAttribute('name'));
+                }else if(ID.indexOf("search_local") >= 0){
+                        if(current_folder.indexOf("local") >= 0)
+                                openTab.imapBox[ID] = current_folder;
+                        else
+                                openTab.imapBox[ID] = 'local_search';
+                }else if(ID.indexOf("search_") >= 0){
+                        if(current_folder.indexOf("local") < 0)
+                                openTab.imapBox[ID] = current_folder;
+                        else
+                                openTab.imapBox[ID] = 'search';
+                }else
+                        openTab.imapBox[ID] = current_folder;
         }
         td = document.createElement("TD");