Changeset 5213 for trunk/expressoMail1_2

Timestamp:

11/29/11 10:13:47 (12 years ago)

Author:

douglasz

Message:

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

File:

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

trunk/expressoMail1_2/js/abas.js

@@ -48 +48 @@
                 footer_menu.style.display = (openTab.type[ID] != 4 ? '' : 'none');
                 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
@@ -53 +54 @@
                                                 alternate_menu.title = get_lang("Unarchive");
                                                 alternate_menu.removeAttribute("onclick");
-                                                alternate_menu.setAttribute("onclick",  'expresso_local_messages.unarchive_msgs(\''+openTab.imapBox[ID]+'\', null)');
+                                                if(!is_ie)
+                                                        alternate_menu.setAttribute("onclick",  'expresso_local_messages.unarchive_msgs(\''+openTab.imapBox[ID]+'\', null)');
+                                                else{
+                                                        alternate_menu.onclick = function(){
+                                                                expresso_local_messages.unarchive_msgs(openTab.imapBox[ID], null);
+                                                        }
+                                                }
                                                 alternate_menu.innerHTML = get_lang("Unarchive");
                                                 
@@ -59 +66 @@
                                                 alternate_menu.title = get_lang("Archive");
                                                 alternate_menu.removeAttribute("onclick");
-                                                alternate_menu.setAttribute("onclick", 'archive_msgs(\''+openTab.imapBox[ID]+'\', null)');                              
+                                                if(!is_ie)
+                                                        alternate_menu.setAttribute("onclick", 'archive_msgs(\''+openTab.imapBox[ID]+'\', null)');              
+                                                else{
+                                                        alternate_menu.onclick = function(){
+                                                                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';
@@ -133 +148 @@
 function create_border(borderTitle, id_value)
 {
+        
         borderTitle = ( ( borderTitle && borderTitle.constructor == String && borderTitle.length > 0 ) ? borderTitle : '&nbsp;' );
 
@@ -184 +200 @@
                 
                 var ID = id_value;
-                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(isNaN(ID) && ID.indexOf("search_local") >= 0){
+                if(isNaN(ID) && ID.indexOf("search_local") >= 0){
                         if(current_folder.indexOf("local") >= 0)
                                 openTab.imapBox[ID] = current_folder;
@@ -199 +210 @@
                         else
                                 openTab.imapBox[ID] = 'search';
+                }else 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
                         openTab.imapBox[ID] = current_folder;
@@ -224 +240 @@
         if ( resize )
                 borderTitle = borderTitle.substring(0, resize*0.08);
+        var cc = document.getElementById("em_message_search");
 
         td.innerHTML = "<div style='width:100%;border:0;padding:0;'>\n\
@@ -230 +247 @@
                             "</div>\n\
                             <div style='width:1px;float:left;clear:right;'>\n\
-                                <img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'/>\n\
-                            </div>\n\
-                        </div>";
-
+                                <img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'/>\n\ " +
+                            "</div>\n\ " + 
+                                                        "<input type=\"hidden\" name=\""+ ID+"\" value=\""+cc.value+"\">" + 
+                        "</div>";
+        
         bb = document.getElementById("border_blank");
         parent_bb = bb.parentNode; //Pego o tbody