Changeset 806

Timestamp:

Mar 20, 2015 10:54:47 AM (10 years ago)

Author:

dungnv

Message:

 

File:

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

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

@@ -690 +690 @@
                     }
 
+                                        for (var i = 0; i < items.length; i++) {
+                                                if (items[i].type == 'directory') {
+                                                        var aryChildDirTmp = [];
+                                                        var aryChildDirID = [];
+                            var aryChildFiles = searchItemsByParent(items[i].id, 'file');
+                            var aryChildDirs = [];
+
+                                                        getAllDirChild(items[i].id, aryChildDirTmp);
+
+                            for (var d = 1; d < aryChildDirTmp.length; d++) {
+                                aryChildDirID[d - 1] = aryChildDirTmp[d];
+                            }
+
+                            for (var j = 0; j < aryChildDirID.length; j++) {
+                                if (o.data.DIRECTORIES[searchItemByID(aryChildDirID[j], 'directory')] != undefined)
+                                    aryChildDirs[aryChildDirs.length] = o.data.DIRECTORIES[searchItemByID(aryChildDirID[j], 'directory')];
+                            }
+
+                            items[i].childs = aryChildDirs;
+                                                }
+                                        }
+                                        
                     var postdata = {act: oClipBoard.act, destination: destination, data: JSON.stringify(items)};
                     var script = oClipBoard.act;
@@ -720 +742 @@
                         }
                     });
-
                 }
 
@@ -759 +780 @@
                     for (var i = 0; i < item.length; i++) {
                         if (item[i].type == 'directory') {
-                            var aryChildDirTmp = [];
+                                item[i] = self.getAllDirChilds(item[i]);
+                                console.log(item[i]);
+                            /*var aryChildDirTmp = [];
                             var aryChildDirID = [];
                             var aryChildFiles = searchItemsByParent(item[i].id, 'file');
@@ -781 +804 @@
 
                             item[i].childDirs = aryChildDirs;
-                            item[i].childFiles = aryChildFiles;
+                            item[i].childFiles = aryChildFiles;*/
                         }
                     }
@@ -845 +868 @@
                     bootbox.confirm(confirmOptions);
                 }
+                
+                this.getAllDirChilds = function (oDirItem) {
+                        var aryChildDirTmp = [];
+                    var aryChildDirID = [];
+                    var aryChildFiles = searchItemsByParent(oDirItem.id, 'file');
+                    var aryChildDirs = [];
+
+                    getAllDirChild(oDirItem.id, aryChildDirTmp);
+                    for (var d = 1; d < aryChildDirTmp.length; d++) {
+                        aryChildDirID[d - 1] = aryChildDirTmp[d];
+                    }
+
+                    for (var j = 0; j < aryChildDirID.length; j++) {
+                        if (o.data.DIRECTORIES[searchItemByID(aryChildDirID[j], 'directory')] != undefined)
+                            aryChildDirs[aryChildDirs.length] = o.data.DIRECTORIES[searchItemByID(aryChildDirID[j], 'directory')];
+
+                        var aryTmp = searchItemsByParent(aryChildDirID[j], 'file');
+                        if (aryTmp.length > 0)
+                            for (var f in aryTmp) {
+                                aryChildFiles[aryChildFiles.length] = aryTmp[f];
+                            }
+                    }
+
+                    oDirItem.childDirs = aryChildDirs;
+                    oDirItem.childFiles = aryChildFiles;
+                    return oDirItem;
+                }
 
                 this.setTreeCurrentNode = function (treeNode) {