Changeset 670 for trunk/expressoMail1_2/js/wfolders.js

Timestamp:

02/06/09 15:34:17 (15 years ago)

Author:

eduardoalex

Message:

Ticket #413

File:

• trunk/expressoMail1_2/js/wfolders.js (modified) (3 diffs)

trunk/expressoMail1_2/js/wfolders.js

@@ -6 +6 @@
         }
 
-        cWFolders.prototype.makeWindow = function(border_id, type)
-        {
+        cWFolders.prototype.makeWindowNew = function(border_id, type,from_search)
+        { //Infelizmente javascript não parece suportar o polimorfismo...
                 _this = this;
         
@@ -60 +60 @@
                                         move_search_msgs(border_id, wfolders_tree._selected.id, wfolders_tree._selected.caption);       
                                 else{
-                                        move_msgs('null', msg_number, border_id, wfolders_tree._selected.id, wfolders_tree._selected.caption);
+                                        proxy_mensagens.proxy_move_messages('null',msg_number, border_id, wfolders_tree._selected.id, wfolders_tree._selected.caption);
                                         wfolders.alert = true;
                                 }
@@ -87 +87 @@
                 el.appendChild(butt);
 
-                if (!Element('dftree_wfolders_tree'))
+                wfolders_tree = new dFTree({name: 'wfolders_tree'});
+                var n_root = new dNode({id:'root', caption:get_lang("My Folders")});
+                wfolders_tree.add(n_root,'anything'); //Places the root; second argument can be anything.
+
+                var folders = tree_folders.getNodesList(cyrus_delimiter);
+                for (var i=1; i<folders.length; i++)
                 {
-                        wfolders_tree = new dFTree({name: 'wfolders_tree'});
-                        var n_root = new dNode({id:'root', caption:get_lang("My Folders")});
-                        wfolders_tree.add(n_root,'anything'); //Places the root; second argument can be anything.
+                        if (proxy_mensagens.is_local_folder(folders[i].id) && from_search) {
+                                continue;
+                        }
+                        var nn = new dNode({
+                                id: folders[i].id,
+                                caption: lang_folder(folders[i].caption),
+                                plusSign: folders[i].plusSign
+                        });
+                        wfolders_tree.add(nn, folders[i].parent);
+                        
+                }
+                Element('wfolders_content_tree').innerHTML = ""; //As buscas não podem incluir mover entre pastas locais, pelo menos por enquanto
+                wfolders_tree.draw(Element('wfolders_content_tree'));
+                n_root.changeState();
+                wfolders_tree.getNodeById('INBOX')._select();
+                _this.showWindow(el, type);
+        }
 
-                        var folders = tree_folders.getNodesList(cyrus_delimiter);
-                        for (var i=1; i<folders.length; i++)
-                        {
-                                var nn = new dNode({id:folders[i].id, caption:lang_folder(folders[i].caption), plusSign:folders[i].plusSign});
-                                wfolders_tree.add(nn,folders[i].parent);
-                        }
-                        
-                        wfolders_tree.draw(Element('wfolders_content_tree'));
-                        n_root.changeState();
-                        wfolders_tree.getNodeById('INBOX')._select();
-                }
-                _this.showWindow(el, type);
+        cWFolders.prototype.makeWindow = function(border_id, type)
+        {
+                this.makeWindowNew(border_id,type,false);
         }