Changeset 7635 for trunk/expressoMail1_2

Timestamp:

12/10/12 17:00:32 (12 years ago)

Author:

acoutinho

Message:

Ticket #3227 - Alertas (amarelos) do Expresso travam operacees do usuario

Location:

trunk/expressoMail1_2

Files:

• js/common_functions.js (modified) (1 diff)
• js/doiMenuData.js (modified) (1 diff)
• js/draw_api.js (modified) (4 diffs)
• js/main.js (modified) (4 diffs)
• js/search.js (modified) (1 diff)
• templates/default/main.css (modified) (1 diff)

trunk/expressoMail1_2/js/common_functions.js

@@ -499 +499 @@
 
         msg_div.innerHTML = '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tbody><tr><th width="40%"></th><th noWrap class="action_info_th">'+msg+'</th><th width="40%"></th></tr></tbody></table>';
-
-        old_divStatusBar.style.display = 'none';
+        
+        //old_divStatusBar.style.display = 'none';
         msg_div.style.display = '';
         // Nao ponha var na frente!! jakjr

trunk/expressoMail1_2/js/doiMenuData.js

@@ -86 +86 @@
      */
     function getLabels(){
-        var labels = DataLayer.get('label',{criteria:{order: 'name'}});
+        var labels = DataLayer.get('label');
+
+        labels = orderLabel( labels );
+
         var menuLabelItems = {};
                 menuLabelItems["new"] = {

trunk/expressoMail1_2/js/draw_api.js

@@ -476 +476 @@
 
 function draw_tree_labels(){
-        labels = DataLayer.get('label',{criteria:{order: 'name'}});
-        if(!$("#MyMarckersList").length)
+    labels = DataLayer.get('label');
+
+    labels = orderLabel( labels );
+
+    if(!$("#MyMarckersList").length)
                 var myLabels = $('#content_folders').append("<div id='MyMarckersList' class='acc-list list-label' ></div>").find("#MyMarckersList");
         else
@@ -589 +592 @@
 }
 
-function update_menu(data){
+function force_update_menu(data){
+    update_menu(data, true)
+}
+
+
+function update_menu(data, forceLoadFolders){
                 /*
                  * @AUTHOR Rodrigo Souza dos Santos
@@ -637 +645 @@
                         folders = data;
                 }
-                draw_new_tree_folder(); 
+                draw_new_tree_folder(false, forceLoadFolders);
                 draw_tree_labels();
                 if(Element("table_quota"))
@@ -4517 +4525 @@
         if(parseInt(preferences.use_dynamic_contacts)){
 
-        REST.get("/usercontacts", false, updateDynamicContact);
+        //REST.get("/usercontacts", false, updateDynamicContact);
 
                 //PREPARAÇÃO DA ARRAY DOS CONTATOS DINÂMICOS

trunk/expressoMail1_2/js/main.js

@@ -298 +298 @@
                 
                 if(parseInt(preferences.use_dynamic_contacts)){
-                        var load_dynamics = function(){
-                                updateDynamicContact();
-                                updateDynamicPersonalContacts();
-                                updateDynamicPersonalGroups();
-                        };
-                        load_dynamics();
-                }
+            updateDynamicContact();
+                }
+
         }
         var handler_automatic_trash_cleanness = function(data){
@@ -1540 +1536 @@
                     msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_r'));
         }
-        if (msgs_number) {
-                refresh();
-        }
-        else{
+//      if (msgs_number) {
+//              refresh();
+//      }
+    if (!msgs_number){
                 $("#"+get_current_folder()).find('span:first').addClass('selected');
         }
@@ -1614 +1610 @@
                                                                                     get_previous_msg: ( !not_opem_previus ? preferences.delete_and_show_previous_message : false ),
                                                                                     decoded: true } ),
-
+                                                async: true,
                                                 success: function( data ){
                                                     data = connector.unserialize( data );
@@ -5280 +5276 @@
                                 return write_msg(get_lang("Permission denied"));
                         }
-                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                        cExecute("$this.imap_functions.get_folders_list&onload=true", force_update_menu);
                 },
                 beforeSend: function( jqXHR, settings ){

trunk/expressoMail1_2/js/search.js

@@ -1886 +1886 @@
                         handler('none');
                 else
-                        cExecute( "$this.imap_functions.search_msg", handler_refresh, "condition="+openTab.condition[currentTab]+"&page="+EsearchE.page+"&sort_type="+sort_type);
+            if(openTab.condition[currentTab] != '')
+                            cExecute( "$this.imap_functions.search_msg", handler_refresh, "condition="+openTab.condition[currentTab]+"&page="+EsearchE.page+"&sort_type="+sort_type);
         }
 

trunk/expressoMail1_2/templates/default/main.css

@@ -350 +350 @@
 
 .em_div_write_msg{ 
-                height: 24px; 
-                background: transparent; 
+        height: 0px; 
+        background: transparent; 
         }