Changeset 121 for pro-bachkim-filespace/sourcecode/assets/js

Timestamp:

Sep 12, 2014 7:24:12 PM (11 years ago)

Author:

dungnv

Message:

 

Location:

pro-bachkim-filespace/sourcecode/assets/js

Files:

• grid.js (modified) (1 diff)
• manager.js (modified) (7 diffs)

pro-bachkim-filespace/sourcecode/assets/js/grid.js

@@ -142 +142 @@
                                 var nodeID = $(node).find('> DIV[class^="file-name"] > INPUT[type="hidden"][class^="id"]').val();
                                 var nodeType = $(node).find('> DIV[class^="file-name"] > INPUT[type="hidden"][class^="type"]').val();
-                                $(node).remove();                               
+                                $(node).remove();
                         }
 

pro-bachkim-filespace/sourcecode/assets/js/manager.js

@@ -51 +51 @@
                                 if( p.callbackFail == undefined ) p.callbackFail = null;
                                 if( p.callbackAlways == undefined ) p.callbackAlways = null;
+                                if( p.parseData == undefined ) p.parseData = null;
+                                if( p.self == undefined ) p.self = this;
 
                                 if (p.script != null && (o.datasource == 'ajax' || isDev)) {
@@ -56 +58 @@
                                                 if (data) {
                                                         parseData = $.parseJSON(data);
+                                                        p.parseData = parseData;
                                                 }
 
@@ -66 +69 @@
                                                 }
 
-                                        }).done(function() {if (p.callbackDone != null)p.callbackDone(this);}).fail(function() {if (p.callbackFail != null)p.callbackFail(this);}).always(function() {if (p.callbackAlways != null)p.callbackAlways(this);});
+                                        }).done(function() {if (p.callbackDone != null)p.callbackDone(p.parseData);}).fail(function() {if (p.callbackFail != null)p.callbackFail(this);}).always(function() {if (p.callbackAlways != null)p.callbackAlways(this);});
                                 }
                                 else if (o.datasource == 'json'){
@@ -120 +123 @@
                                 aryChildFiles = searchItemsByParent(dirID, 'file');
 
+                                node.id = dir.id;
+                                node.name = dir.name;
+                                node.type = 'directory';
+
                                 $(aryChildDirs).each(function (index) {
-                                        aryChildIDs[index] = this.id;
+                                        var id = this.id;
+                                        var name = this.name;
+                                        var type = 'directory';
+                                        var cDir = {id:id, name:name, type:type, childs:null};
+                                        aryChildIDs[index] = cDir;
                                 });
-
-                                if (node.id == undefined) node.id = dirID;                              
 
                                 if ($(aryChildFiles).length > 0 ) {
                                         if (node.files == undefined) node.files = [];
                                         $(aryChildFiles).each(function (index) {
-                                                node.files[index] = this.id;
+                                                var id = this.id;
+                                                var name = this.name;
+                                                var type = 'file';
+                                                var cFile = {id:id, name:name, type:type};
+                                                node.files[index] = cFile;
                                         });
                                 }                               
@@ -137 +150 @@
                                         $(aryChildIDs).each(function (index) {
                                                 node.childs[index] = new Object;
-                                                buildTreeFromParent(aryChildIDs[index], node.childs[index]);
+                                                buildTreeFromParent(aryChildIDs[index].id, node.childs[index]);
                                         });
                                 }
@@ -388 +401 @@
                                 $(oClipBoard.items).each(function (index) {
                                         var node = new Object;
-                                        buildTreeFromParent(this.id, node);
+                                        if (this.type == 'directory')
+                                                buildTreeFromParent(this.id, node);
+                                        else {
+                                                node.id = this.id;
+                                                node.type = 'file';
+                                        }
+
                                         items[index] = node;
                                 });
@@ -483 +502 @@
                                                                                 callbackSuccess:function(parseData){
                                                                                         if($(parseData.DIRECTORIES).length > 0) {
-                                                                                                for(var i = 0; i < $(parseData.DIRECTORIES).length; i++) {
-                                                                                                        o.oTree.deletion($(parseData.DIRECTORIES).get(i));
-                                                                                                        o.oGrid.deletion($(parseData.DIRECTORIES).get(i), 'directory');
-                                                                                                }
+                                                                                                $(parseData.DIRECTORIES).each (function (index) {
+                                                                                                        o.oTree.deletion(this);
+                                                                                                        o.oGrid.deletion(this, 'directory');    
+                                                                                                });
                                                                                         }
 
                                                                                         if($(parseData.FILES).length > 0) {
-                                                                                                for(var i = 0; i < $(parseData.FILES).length; i++) {    
-                                                                                                        var id = $(parseData.FILES).get(i);
-                                                                                                        var file = o.data.FILES[searchItemByID(id)];                                                                                    
-                                                                                                        o.oGrid.deletion(file.id, file.minetype);
-                                                                                                }                                                                                               
+                                                                                                $(parseData.FILES).each (function (index) {
+                                                                                                        var file = o.data.FILES[searchItemByID(this, 'file')];                                                                                  
+                                                                                                        o.oGrid.deletion(this, file.minetype);
+                                                                                                });     
                                                                                         }
-
+                                                                                },
+                                                                                callbackDone: function (obj) {
+                                                                                        var dirs = [];
+                                                                                        var files = [];
+                                                                                        if($(parseData.DIRECTORIES).length > 0) {
+                                                                                                $(o.data.DIRECTORIES).each(function (index){
+                                                                                                        var found = $.inArray(this.id, parseData.DIRECTORIES);
+                                                                                                        if(found == -1) {
+                                                                                                                dirs[$(dirs).length] = this;
+                                                                                                        }
+                                                                                                });
+                                                                                                
+                                                                                                o.data.DIRECTORIES = dirs;
+                                                                                        }
+                                                                                        
+                                                                                        if($(parseData.FILES).length > 0) {
+                                                                                                $(o.data.FILES).each(function (index){
+                                                                                                        var found = $.inArray(this.id, parseData.FILES);
+                                                                                                        if(found == -1) {
+                                                                                                                files[$(dirs).length] = this;
+                                                                                                        }
+                                                                                                })
+                                                                                                
+                                                                                                o.data.FILES = files;
+                                                                                        }
+                                                                                        
+                                                                                        o.oTree.setData (o.data.DIRECTORIES);
+                                                                                        o.oGrid.setData (o.data);
                                                                                 },
                                                                                 callbackFail: function(){}