Changeset 7635 for trunk/prototype/modules/mail/js/foldertree.js

Timestamp:

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

Author:

acoutinho

Message:

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

File:

• trunk/prototype/modules/mail/js/foldertree.js (modified) (6 diffs)

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){