Changeset 860 for pro-violet-viettel

Timestamp:

Mar 31, 2015 11:17:28 AM (10 years ago)

Author:

dungnv

Message:

 

File:

• pro-violet-viettel/www/deploy/20150304/assets/js/manager.js (modified) (2 diffs)

pro-violet-viettel/www/deploy/20150304/assets/js/manager.js

@@ -941 +941 @@
                                     }
                                     
-                                    var aryTree = [];
-                                    aryTree = self.buildDirectoriesTree(items[0].id);
-                                    console.log(aryTree);
-                                    return;
-
-                                    /*for (var i = 0; i < items.length; i++) {
+                                    for (var i = 0; i < items.length; i++) {
                                         if (items[i].type == 'directory') {
-                                            items[i] = self.getAllDirChilds(items[i]);
-                                        }
-                                    }*/
+                                                items[i].childDirs = self.buildDirectoriesTree(items[i]);
+                                                items[i].childFiles = searchItemsByParent(items[i].id, 'file');
+                                        }
+                                    }
 
                                     var postdata = {
@@ -1311 +1307 @@
                                 }
 
-                                this.buildDirectoriesTree = function (parentID) {
-                                        if (parentID == null) parentID = 0;
+                                this.buildDirectoriesTree = function (objDir) {
+                                        var parentID = objDir.id;
                                         var aryDirs = o.data.DIRECTORIES;
+                                        var aryFiles = o.data.FILES;
                                         var branch = [];
-                                        var children = [];
+                                        var childDirs = [];
+                                        var childFiles = [];
+                                        
                                         for (var i = 0; i < aryDirs.length; i++) {
                                                 if (aryDirs[i].parentID == parentID) {
-                                                        children = self.buildDirectoriesTree(aryDirs[i].id);
-                                                        if (children.length > 0) {
-                                                                aryDirs[i].childDirs = children; 
-                                                        }
-                                                        branch.push(aryDirs[i]);
+                                                        childDirs = self.buildDirectoriesTree(aryDirs[i]);
+                                                        aryDirs[i].childDirs = childDirs;
+                                                        aryDirs[i].childFiles = searchItemsByParent(aryDirs[i].id, 'file');
+                                                        branch.push(aryDirs[i]);
                                                 }
                                         }