Changeset 7635

Timestamp:

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

Author:

acoutinho

Message:

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

Location:

trunk

Files:

• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• expressoMail1_2/js/doiMenuData.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (4 diffs)
• expressoMail1_2/js/main.js (modified) (4 diffs)
• expressoMail1_2/js/search.js (modified) (1 diff)
• expressoMail1_2/templates/default/main.css (modified) (1 diff)
• prototype/api/rest.js (modified) (4 diffs)
• prototype/modules/calendar/js/timezone.js (modified) (1 diff)
• prototype/modules/filters/filters.js (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (6 diffs)
• prototype/modules/mail/js/label.js (modified) (2 diffs)

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; 
         } 
 

trunk/prototype/api/rest.js

@@ -94 +94 @@
             success: function( dt, textStatus, jqXHR ){
 
-                if(REST.isInvalidToken(dt)){
-                    REST.load('', true);
-                    
-                    if(!REST.me)
-                        return {error: 'Empty session', title: 'Error in refresh token', description: 'Error in refresh token.'};
-                    
-                    var ref = REST.resquests[this.url];
-                    result =  REST.send(ref.url, ref.type, ref.data, ref.callback, ref.sync, ref.extraOptions)
-                }
                 delete REST.resquests[this.url];
                 
@@ -137 +128 @@
             envelope['dataType'] = type[1];
 
-        if(REST.me)
-            envelope = $.extend( envelope, {
-                beforeSend: function (xhr){
-                    xhr.setRequestHeader('Authorization', "OAUTH Bearer " + REST.me.token)
-                }
-            });
-
         if( extraOptions )
             envelope = $.extend( envelope, extraOptions );
@@ -150 +134 @@
       
         return( result );
-    },
-    
-    isInvalidToken: function(data){
-        return ((data) && (data.error && data.error == 'invalid_grant') && (data.error_description == 'The access token provided has expired.')) ? true : false
     },
     
@@ -165 +145 @@
 
     load: function(url, isRefresh){
-        this.me = this.dispatch( (url || '') + "me", (isRefresh ? {
-            refreshToken: true
-        } : {}), false, true)   
+
     }
     

trunk/prototype/modules/calendar/js/timezone.js

@@ -5 +5 @@
 */
 
-var objTime = DataLayer.dispatch( "timezones", {teste:'123'} );
+var objTime = DataLayer.dispatch( "timezones" );
 
 Timezone = {

trunk/prototype/modules/filters/filters.js

@@ -21 +21 @@
  * Verifica se a regra Fora de escritório está ativa
  */
-function outOfficeVerify() {    
-        DataLayer.remove('filter', false);
+function outOfficeVerify(force) {
+        if(force)
+        DataLayer.remove('filter', false);
+
         var filters = DataLayer.get("filter");
         var outoffice_active = false;

trunk/prototype/modules/mail/js/foldertree.js

@@ -87 +87 @@
 }
 
-function draw_new_tree_folder(callback){
-    var folders = DataLayer.get("folder", true);    
+function normalizeFolder( folders ){
+
+    if(folders  == "")
+        return folders;
+
+    if( !$.isArray( folders  )){
+        var array = [];
+
+        for(var i in folders){
+
+            if(i.indexOf('(javascript)') < 0)
+                array[array.length] = folders[i];
+        }
+
+        folders = array;
+
+    }
+
+    return folders;
+
+}
+
+function draw_new_tree_folder(callback, force){
+
+    if(force)
+        DataLayer.remove('folder', false);
+
+    var folders =  normalizeFolder( DataLayer.get('folder') );
 
 if(preferences.use_local_messages == 1){
@@ -283 +309 @@
             if(folder_to_move == "tbody_box"){
                 move_msgs2(get_current_folder(), 'selected', 0, folder_to, to_folder_title,true);
-                return refresh();
+                return;
             }
             //SE FOR DE UMA PESQUISA RAPIDA
             else if(ui.draggable.parents('[id^="content_id_"]')[0]){
                 move_search_msgs("content_id_"+border_id, folder_to, to_folder_title);
-                return refresh();
+                return;
             }
             // eventnsagens : SE O DROP VIER DE UMA ABA ABERTA
@@ -296 +322 @@
                 alternate_border(border_id);
                 move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true);
-                return refresh();
+                return;
             }
             // SE O DROP VIER DA LISTA DE PASTAS
@@ -496 +522 @@
                                         }
                                         write_msg(get_lang("The folder %1 was successfully removed", folder_name));
-                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                        cExecute("$this.imap_functions.get_folders_list&onload=true", force_update_menu);
                                     }
                                 });
@@ -511 +537 @@
                     } */
                 })
-                //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < END
-                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN
+                //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < END
+                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN
                 .end().find(".float-menu-new").click(function(){
                     $(this).parents(".float-menu").hide();
@@ -661 +687 @@
                     write_msg(get_lang('You must wait while the messages will be exported...'),true);        
                 });
-                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < END
+                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < END
             }
             if(!$(".new_folder").length){

trunk/prototype/modules/mail/js/label.js

@@ -328 +328 @@
 }
 
+function SortByName(a, b){
+    var aName = a.name.toLowerCase();
+    var bName = b.name.toLowerCase();
+    return ((aName < bName) ? -1 : ((aName > bName) ? 1 : 0));
+}
+
+//Reduz a quantidade de requests
+function orderLabel(labels){
+
+    if(labels == "")
+        return labels;
+
+    if(!$.isArray( labels )){
+        var array = [];
+
+        for(var i in labels){
+
+            array[ array.length ] = labels[ i ];
+
+        }
+
+        labels = array;
+
+    }
+
+    return labels.sort(SortByName);
+}
+
 function init_label(data){
 
@@ -333 +361 @@
         
         //TODO Mudar quando API abstrair atualizações no cache
-        DataLayer.remove('label',false);
-        labels = DataLayer.get('label',{criteria:{order: 'name'}});
+        var labels = DataLayer.get('label');
+
+    labels = orderLabel( labels );
         
         if(labels){