Changeset 3018 for branches/2.2/expressoMail1_2/js/main.js

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/js/main.js (modified) (12 diffs)

branches/2.2/expressoMail1_2/js/main.js

@@ -59 +59 @@
                 cExecute ("$this.db_functions.get_dropdown_contacts", save_contacts); //Save contacts needs preferences.
                 cExecute ("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                cExecute ("$this.imap_functions.get_range_msgs2&folder=INBOX&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type=SORTARRIVAL&search_box_type=ALL&sort_box_reverse=1", handler_draw_box);
                 
         }
@@ -320 +321 @@
 
                 
-                if(Element("border_id_" + id_msg_read)) 
-                        alternate_border(id_msg_read);          
+                if(Element("border_id_" + id_msg_read)) {
+                        alternate_border(id_msg_read);  
+                        resizeWindow();         
+                }
                 else {
                         var border_id = create_border(msg_info.subject, id_msg_read);
@@ -393 +396 @@
                 if (box.childNodes.length == 0)
                 {
-                        td_info = document.createElement("H3");
-                        td_info.setAttribute("height", "25%");
+                        var tr_info = document.createElement("TR"); 
+                        var td_info = document.createElement("TD"); 
+                        td_info.setAttribute("colspan", "10"); 
                         td_info.setAttribute("background", "#FFF");
-                        td_info.setAttribute("id", "msg_info");
+                        tr_info.setAttribute("id", "msg_info");
                         td_info.align = "center";
-                        td_info.innerHTML = get_lang("This mail box is empty");
+                        td_info.style.padding = "25px";                  
+                        td_info.style.fontWeight = "bold"; 
+                        td_info.style.fontSize = "11pt";   
+                        td_info.innerHTML = get_lang("This mail box is empty");i
+                        tr_info.appendChild(td_info); 
                         box.appendChild(td_info);
                 }
@@ -410 +418 @@
                         var box = Element("tbody_box");
                         table_element.appendChild(box);
-                        
+                        if (data[0].msg_folder != current_folder) // Bad request 
+                                return false;
+
                         for (var i=0; i<data.length; i++){
-                                var new_msg = this.make_tr_message(data[i], current_folder);                            
-                                _dragArea.makeDragged(new_msg, data[i].msg_number, data[i].subject, true);
-                                eval(data[i].command);
+                                var existent = document.getElementById(data[i].msg_number); 
+                                if (!existent) 
+                                { 
+                                        var new_msg = this.make_tr_message(data[i], current_folder);                             
+                                        _dragArea.makeDragged(new_msg, data[i].msg_number, data[i].subject, true); 
+                                        eval(data[i].command); 
+                                } 
                         }
                         if (! typeof(data.msgs_to_delete) == 'undefined')
@@ -633 +647 @@
 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)
                 return move_search_msgs('content_id_'+currentTab,new_folder,new_folder_name);
@@ -1334 +1347 @@
 
         // IM Module Enabled
-        if( window.parent.loadscript )
+        if( window.parent.loadscript && loadscript.autoStatusIM ) 
         {
                 config_events( body.contentWindow.document, "onkeypress", loadscript.autoStatusIM );    
@@ -1429 +1442 @@
 
 function send_message_return(data, ID){
+    watch_changes_in_msg(ID); 
 
     var sign = false;
@@ -1702 +1716 @@
 function return_save(data,border_id,folder_name,folder_id,message_id)
 {
+        Element("send_button_"+border_id).style.visibility="visible"; 
         var handler_delete_msg = function(data){ refresh(preferences.alert_new_msg); };
 
@@ -1839 +1854 @@
                 save_link.className = 'message_options_inactive';
                 watch_changes_in_msg(border_id);
-                Element("send_button_"+border_id).style.visibility="visible";
                 write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
         }               
@@ -1858 +1872 @@
                 sendButton.style.visibility="hidden";
 
-        if (openTab.imapBox[border_id]) //Gets the imap folder
+        if (openTab.imapBox[border_id] && openTab.type[border_id] != 6 && openTab.type[border_id] != 7) //Gets the imap folder 
                 var folder_id = openTab.imapBox[border_id];
         else
@@ -2159 +2173 @@
                 if(!verify_session(data))
                         return;
-                if (get_current_folder() == 'INBOX'+cyrus_delimiter+trashfolder){
-                        draw_paging(0);
-                        kill_current_box();
-                }
                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+trashfolder).alter({caption: get_lang("Trash")});
                 tree_folders.getNodeById('INBOX'+cyrus_delimiter+trashfolder)._refresh();
                 update_quota(get_current_folder());
-                if (data)
+                if (data){
                         write_msg(get_lang('Your Trash folder was empty.'));
+                        if (get_current_folder() == 'INBOX'+cyrus_delimiter+trashfolder){
+                                draw_paging(0);
+                                kill_current_box();
+                                Element('tot_m').innerHTML = 0;
+                                Element('new_m').innerHTML = 0;
+                        }
+                }
                 else
                         write_msg(get_lang('ERROR emptying your Trash folder.'));
@@ -2386 +2403 @@
         else{
                 if(data == 'Post-Content-Length')
-                        write_msg(get_lang('The size of this message has exceeded  the limit (%1B).',Element('upload_max_filesize').value));
+                        write_msg(get_lang('The size of this message has exceeded  the limit (%1B).', preferences.max_attachment_size ? preferences.max_attachment_size : Element('upload_max_filesize').value));
                 else {  /*
                         * @author Rommel Cysne (rommel.cysne@serpro.gov.br)