Changeset 7738

Timestamp:

01/14/13 09:49:06 (11 years ago)

Author:

acoutinho

Message:

Ticket #3284 - Travamento ao carregar a arvore de pastas do usuario

Location:

trunk

Files:

• expressoMail1_2/assetic.php (modified) (3 diffs)
• expressoMail1_2/js/folder.js (added)
• expressoMail1_2/js/main.js (modified) (2 diffs)
• prototype/modules/mail/js/foldertree.js (modified) (1 diff)

trunk/expressoMail1_2/assetic.php

@@ -66 +66 @@
 /*Se o servidor possuir a jvm então minifique os arquivos*/
 if (strpos($javaVersion,"java version") !== false){
-    $filterManager->set('yui_js', $compressor);    
-    $plugins->ensureFilter($filterManager->get('yui_js'));    
+    $filterManager->set('yui_js', $compressor);
+    $plugins->ensureFilter($filterManager->get('yui_js'));
 }
 
@@ -75 +75 @@
 $scripts = new AssetCollection(array(
     new FileAsset('js/modal/modal.js'),
+    new FileAsset('js/folder.js'),
     new FileAsset('js/base64.js'),
     new FileAsset('js/QuickCatalogSearch.js'),
@@ -91 +92 @@
 
 if (strpos($javaVersion,"java version") !== false){
-    //$filterManager->set('yui_js', $compressor);    
-    //$scripts->ensureFilter($filterManager->get('yui_js'));    
+    $filterManager->set('yui_js', $compressor);
+    $scripts->ensureFilter($filterManager->get('yui_js'));
 }
 

trunk/expressoMail1_2/js/main.js

@@ -1012 +1012 @@
                         { 
                                         var arrayFolder = folder.split(cyrus_delimiter); 
-                                        userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash'];  
-                                        /** TODO Mudar quando melhorias forem implementadas na API de atualização do cache */
-                                        DataLayer.remove('folder', false);
-                                        DataLayer.get('folder');
-                                        
-                                        var has_folder = DataLayer.get('folder', userTrashFolder);
+                                        userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash'];
+
+                                        var has_folder = Folder.get( userTrashFolder, false );
                                         if(!has_folder){
                                                 create_new_folder(special_folders['Trash'], 'user'+cyrus_delimiter+arrayFolder[1]);
@@ -5485 +5482 @@
                         }else{
                                 var prefix = 'user' + cyrus_delimiter+user_selected_name;
-                                
-                                /** TODO Mudar quando melhorias forem implementadas na API de atualização do cache */
-                                DataLayer.remove('folder', false);
-                                DataLayer.get('folder');
-                                
-                                var has_folder = DataLayer.get('folder', prefix + cyrus_delimiter + draftsfolder);
-                                if(!has_folder){
+
+                                var has_folder = Folder.get( (prefix + cyrus_delimiter + draftsfolder), false );
+
+                if(!has_folder){
                                         create_new_folder(draftsfolder, prefix);
                                 }

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

@@ -111 +111 @@
 function draw_new_tree_folder(callback, force){
 
-    if(force)
-        DataLayer.remove('folder', false);
-
-    var folders =  normalizeFolder( DataLayer.get('folder') );
+    var folders =  normalizeFolder( Folder.get( false, force ) );
 
 if(preferences.use_local_messages == 1){