Changeset 2112

Timestamp:

03/02/10 09:56:04 (14 years ago)

Author:

eduardoalex

Message:

Ticket #897 - corrigindo erro gerado pela revisao [2104]

Location:

trunk/expressoMail1_2/js

Files:

• abas.js (modified) (2 diffs)
• main.js (modified) (1 diff)
• messages_proxy.js (modified) (1 diff)

trunk/expressoMail1_2/js/abas.js

@@ -81 +81 @@
                 window_DropDownContacts.style.visibility = 'hidden';
         }
-        
-        if (openTab.imapBox[ID])
-    {
-                current_folder = openTab.imapBox[ID];
-    }
-        
+
         if (typeof(ID) == 'number')
         {
@@ -115 +110 @@
         else
         {
-        if (Element("border_id_"+id_value)) // It's opened already!
+                if (Element("border_id_"+id_value)) // It's opened already!
                         return alternate_border(id_value);
                 var ID = id_value;
-        }
-        openTab.imapBox[ID] = current_folder;
+                openTab.imapBox[ID] = current_folder;
+        }
         td = document.createElement("TD");
         td.id="border_id_" + ID;

trunk/expressoMail1_2/js/main.js

@@ -633 +633 @@
 
 function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg){
+
         if (! folder || folder == 'null')
-                folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : get_current_folder();
+                folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : (openTab.imapBox[currentTab] ? openTab.imapBox[currentTab]:get_current_folder());
 
         if(openTab.type[currentTab] == 1)

trunk/expressoMail1_2/js/messages_proxy.js

@@ -179 +179 @@
         messages_proxy.prototype.proxy_move_messages = function (folder, msgs_number, border_ID, new_folder, new_folder_name) {
                 if (! folder || folder == 'null')
-                        folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : get_current_folder();
+                        folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : (openTab.imapBox[currentTab]!="" ? openTab.imapBox[currentTab]:get_current_folder());
 
                 if ((this.is_local_folder(folder)) && (this.is_local_folder(new_folder))) { //Move entre pastas não locais...