Changeset 765

Timestamp:

04/27/09 15:05:45 (15 years ago)

Author:

amuller

Message:

Homologação

Location:

companies/celepar/expressoMail1_2/js

Files:

• common_functions.js (modified) (1 diff)
• main.js (modified) (5 diffs)

companies/celepar/expressoMail1_2/js/common_functions.js

@@ -44 +44 @@
                 for(var i = 1; BordersArray.length > 1 && i < BordersArray.length;i++) {
                         var div_scroll = Element("div_message_scroll_"+BordersArray[i].sequence);
+                        var div = Element("content_id_"+BordersArray[i].sequence);
+
+                        // This comented code cause Firefox to stuck some request 
+                        if(div)
+//                              div.setAttribute("style","height: "+parseInt(defaultHeight - 90)+"px;");
+                                div.style.height = defaultHeight - 90;
                         if(div_scroll)
-                                div_scroll.style.height = defaultHeight - 122;
-                        var div = Element("content_id_"+BordersArray[i].sequence);
-                        if(div)
-                                div.style.height = defaultHeight - 73;
-                }
-        }
+                                div_scroll.setAttribute("style","height: "+parseInt(defaultHeight - 130)+"px;");
+//                              div_scroll.style.height = defaultHeight - 130;
+                }
+        }
+
         if(Element('content_folders'))
                 Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150);
         if(Element("divScrollMain_"+numBox))
-                Element("divScrollMain_"+numBox).style.height   = defaultHeight - (is_ie ? 111 : 110);  
+                Element("divScrollMain_"+numBox).style.height   = defaultHeight - (is_ie ? 111 : 110);
 }
 // END: FUNCTION RESIZE WINDOW

companies/celepar/expressoMail1_2/js/main.js

@@ -3 +3 @@
 // tempo do auto save (em milisegundos)
 // 20000 = 20 segundos
-var autosave_time = 2000;
+var autosave_time = 20000;
 
 function init(){
@@ -270 +270 @@
 }
 
-function delete_msgs2(folder, msgs_number, border_ID, show_success_msg)
+function delete_msgs(folder, msgs_number, border_ID, show_success_msg)
 {
+        if (arguments.length < 4){
+                show_success_msg = true;
+        }
 
         if (folder == 'null')
@@ -279 +282 @@
                 return move_search_msgs('content_id_'+currentTab);
 
-        if(currentTab && openTab.type[currentTab] > 1)
-                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+        if(currentTab.toString().indexOf("_r") != -1){
+                        msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+        }
 
         if ((parseInt(preferences.save_deleted_msg)) && (folder!='INBOX'+cyrus_delimiter+trashfolder)){
@@ -341 +345 @@
         else
                 write_msg(get_lang('No selected message.'));            
-}
-function delete_msgs(folder, msgs_number, border_ID)
-{ 
-        delete_msgs2(folder, msgs_number, border_ID, true);
 }
 
@@ -579 +579 @@
                 
                 if (preferences.keep_archived_messages == 0) { //Remove as mensagens
-                                delete_msgs2(folder,msgs_to_remove,'null',false);
+                                delete_msgs(folder,msgs_to_remove,'null',false);
                 }
                 update_tree=(!has_local_messages_before) && expresso_local_messages.has_local_mails();