Changeset 845

Timestamp:

05/12/09 15:03:58 (15 years ago)

Author:

amuller

Message:

Ticket #500 - Problemas na busca para Firefox 3

Location:

trunk/expressoMail1_2/js

Files:

• common_functions.js (modified) (1 diff)
• main.js (modified) (6 diffs)
• search.js (modified) (1 diff)

trunk/expressoMail1_2/js/common_functions.js

@@ -139 +139 @@
         remove_className(msg, 'flagged_msg');
         Element("td_message_important_"+msg_number).innerHTML = '';
+}
+
+function removeAll(id){
+        do
+        {
+                if (typeof(Element(id)) == 'undefined')
+                        break;
+                Element(id).parentNode.removeChild(Element(id));
+        }
+        while(Element(id));
 }
 

trunk/expressoMail1_2/js/main.js

@@ -280 +280 @@
 
         if(openTab.type[currentTab] == 1)
-                return move_search_msgs('content_id_'+currentTab);
+                return move_search_msgs('content_id_'+currentTab,'INBOX'+cyrus_delimiter+trashfolder,trashfolder);
 
         if(currentTab.toString().indexOf("_r") != -1){
@@ -355 +355 @@
                 var check_box = main_list[j].firstChild.firstChild; 
                 if(check_box && check_box.checked) {
-                        if (proxy_mensagens.is_local_folder(main_list[j].name)) {
+                        if (proxy_mensagens.is_local_folder(main_list[j].getAttribute('name'))) {
                                 alert(get_lang("You cant manipulate local messages on search"));
                                 return;
@@ -381 +381 @@
                 selected_messages = selected_messages.split(",");
                 for (i = 0; i < selected_messages.length; i++){
-                        var tr = Element(selected_messages[i]);
-                        tr.parentNode.removeChild(tr);
+                        removeAll(selected_messages[i]);
                 }
                 purgeCache();
@@ -394 +393 @@
                         for (i = 0; i < selected_msg_array.length; i++){
                                 var tr = Element(selected_msg_array[i]);
-                                if (tr.name == new_folder)
+                                if (tr.getAttribute('name') == new_folder)
                                 {
                                         write_msg(get_lang('At least one message have the same origin'));
                                         return false;
                                 }
-                                selected_param += ','+tr.name+';'+tr.id;
+                                trfolder = (tr.getAttribute('name') == null?get_current_folder():tr.getAttribute('name'));
+                                selected_param += ','+trfolder+';'+tr.id;
                         }
                 }
@@ -405 +405 @@
                 {
                         var tr=Element(selected_messages);
-                        if (tr.name == new_folder)
+                        if (tr.getAttribute('name') == new_folder)
                         {
                                 write_msg(get_lang('The origin folder and the destination folder are the same.'));
                                 return false;
                         }
-                        selected_param=tr.name+';'+tr.id;
+                        trfolder = (tr.getAttribute('name') == null?get_current_folder():tr.getAttribute('name'));
+                        selected_param=trfolder+';'+tr.id;
                 }
                 var params = "";
@@ -433 +434 @@
         if (! folder || folder == 'null')
                 folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : get_current_folder();
-        
+
+        if(openTab.type[currentTab] == 1)
+                return move_search_msgs('content_id_'+currentTab,new_folder,new_folder_name);
+
         var handler_move_msgs = function(data){
                 if(typeof(data) == 'string')

trunk/expressoMail1_2/js/search.js

@@ -347 +347 @@
                         var subject = aux[2];
                         tr.id = uid_msg;
-                        tr.name = mailbox;
-
-                        var _onclick = function () { cExecute("$this.imap_functions.get_info_msg&msg_number="+this.parentNode.id+"&msg_folder="+url_encode(this.parentNode.name),show_msg); };
+                        tr.setAttribute('name',mailbox);
+
+                        var _onclick = function () { cExecute("$this.imap_functions.get_info_msg&msg_number="+this.parentNode.id+"&msg_folder="+url_encode(this.parentNode.getAttribute('name')),show_msg); };
                         for(var j=0 ; j < 10 ; j++)
                         {