Changeset 140

Timestamp:

Sep 19, 2014 7:10:40 PM (11 years ago)

Author:

dungnv

Message:

 

Location:

pro-bachkim-filespace/sourcecode/assets/js

Files:

• grid.js (modified) (3 diffs)
• manager.js (modified) (16 diffs)
• tree.js (modified) (4 diffs)

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

@@ -118 +118 @@
                                 var parentDirID = o.manager.getTreeCurrentNode();
                                 if (o.data.DIRECTORIES.length > 0) {
-                                        for (var i = 0; i < o.data.DIRECTORIES.length; i++) {
-                                                if (o.data.DIRECTORIES[i].parentID == parentDirID) {
-                                                        var li = createNode ({item: o.data.DIRECTORIES[i]});
+                                        for (var d in o.data.DIRECTORIES) {
+                                                if (o.data.DIRECTORIES[d].parentID == parentDirID) {
+                                                        var li = createNode ({item: o.data.DIRECTORIES[d]});
                                                         $(ul).append(li);
                                                 }
@@ -127 +127 @@
                                 
                                 if (o.data.FILES.length > 0) {
-                                        for (var i = 0; i < o.data.FILES.length; i++) {
-                                                if (o.data.FILES[i].parentID == parentDirID) {
-                                                        var li = createNode ({item: o.data.FILES[i]});
+                                        for (var f in o.data.FILES) {
+                                                if (o.data.FILES[f].parentID == parentDirID) {
+                                                        var li = createNode ({item: o.data.FILES[f]});
                                                         $(ul).append(li);
                                                 }
@@ -192 +192 @@
                          ******************/
                         
-                        this.reloadGrid = function (nodeID) {
+                        this.reloadGrid = function () {
                                 initGrid();
                         }

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

@@ -197 +197 @@
                                 }
                                 
-                                for (var i = 0; i < data.length; i++) {
-                                        if (data[i].id == id) return i;
+                                //for (var i = 0; i < data.length; i++) {
+                                for (var i in data) {
+                                        if (data[i].id == id) {
+                                                return i;
+                                        }
                                 }
                         }
@@ -218 +221 @@
                                 }
                                 
-                                for (var i = 0; i < data.length; i++) {
+                                for(i in data) {
                                         if (data[i].parentID == parentID) {
                                                 aryItem[index] = data[i];
@@ -238 +241 @@
                                                                         self.updateData({updateAll:true});
                                                                         o.oTree.refeshTree();
-                                                                        console.log(o);
                                                                 },
                                                                 callbackDone:function () {$(o).find('i').removeClass('icon-spin');},
@@ -261 +263 @@
                         
                         var btnCopyClick = function () {                                
-                                copy();
+                                copy('copy');
                         }
 
@@ -268 +270 @@
                         }
                         
+                        var btnCutClick = function () {
+                                copy('move');
+                        }
                         
                         var bindEventToToolbars = function () {
@@ -275 +280 @@
                                 $(btnDel).click(function(e){btnDelClick()});
                                 $(btnCopy).click(function(e){btnCopyClick()});
+                                $(btnCut).click(function(e){btnCutClick()});
                                 $(btnPaste).click(function(e){btnPasteClick()})
                                 
-                                /*btnCut
-                                btnShare
+                                /*btnShare
                                 btnPreview
                                 btnDownload
@@ -364 +369 @@
                                         o.oTree.createNode(node);
                                         o.data.DIRECTORIES[$(o.data.DIRECTORIES).length] = node;
-                                        if (o.oGrid) o.oGrid.reloadGrid(parseData.parentID);
+                                        if (o.oGrid) o.oGrid.reloadGrid();
                                 }
                         }
@@ -372 +377 @@
                         /********************************
                          * COPY & PASTE & MOVE - START  *
-                         ************=*******************/
-                        var copy = function (){
+                         ************=*******************/      
+                        var copy = function (act){
                                 //detect selected items
                                 //push to clipboard
@@ -381 +386 @@
                                         var node = o.oTree.getSelectedNode();
                                         var itemID = $(node).attr('id');
+                                        
+                                        if (itemID == 0) return false;
+                                        
                                         items[0] = o.data.DIRECTORIES[searchItemByID(itemID, 'directory')];
                                         items[0].type = 'directory';
@@ -387 +395 @@
                                 if ($(items).length > 0) {
                                         oClipBoard.items = items;
-                                        oClipBoard.act = 'copy';
-                                }
+                                        oClipBoard.act = act;
+                                }
+                                return true;
                         }
                         
@@ -398 +407 @@
                                 var items = [];
                                 var destination = self.getTreeCurrentNode();
-
-                                $(oClipBoard.items).each(function (index) {
-                                        var node = new Object;
-                                        if (this.type == 'directory')
-                                                buildTreeFromParent(this.id, node);
-                                        else {
-                                                node.id = this.id;
-                                                node.type = 'file';
-                                        }
-
-                                        items[index] = node;
-                                });
-
-                                var postdata = {destination:destination,data:JSON.stringify(items)};
-                                var script = 'copy';
+                                if (oClipBoard.act != 'copy') {
+                                        $(oClipBoard.items).each(function (index) {
+                                                var node = new Object;
+                                                if (this.type == 'directory')
+                                                        buildTreeFromParent(this.id, node);
+                                                else {
+                                                        node.id = this.id;
+                                                        node.type = 'file';
+                                                }
+        
+                                                items[index] = node;
+                                        });
+                                }
+                                else {
+                                        items = oClipBoard.items;
+                                }
+                                
+                                var postdata = {act:oClipBoard.act,destination:destination,data:JSON.stringify(items)};
+                                var script = oClipBoard.act;
+                                
                                 sendCommand ({
                                         postdata:postdata,
                                         script:script,
                                         callbackSuccess:function(parseData){
-                                                console.log(parseData);
+                                                if (oClipBoard.act == 'copy'){
+                                                        $(parseData.DIRECTORIES).each(function (index) {
+                                                                o.data.DIRECTORIES[$(o.data.DIRECTORIES).length] = this;
+                                                        });
+                                                        
+                                                        $(parseData.FILES).each(function (index) {
+                                                                o.data.FILES[$(o.data.FILES).length] = this;
+                                                        });
+                                                                                                        
+                                                        o.data.DIRECTORIES.sort(function (a,b) {
+                                                                return a.parentID - b.parentID;
+                                                        });                                             
+                                                        
+                                                        o.oTree.setData (o.data.DIRECTORIES);
+                                                        o.oGrid.setData (o.data);                                               
+                                                        o.oTree.createCopyNode(parseData.DIRECTORIES);
+                                                        o.oGrid.reloadGrid();
+                                                }
                                         }
                                 });
@@ -424 +455 @@
 
                         var move = function () {
-
+                                
                         }
 
@@ -453 +484 @@
                                 
                                 confirmText += '<br /><div style="color:red">(hà nh động nà y sẜ xóa tất cả thÆ° mục con và  các file trong các thÆ° mục đã chọn)</div>';
+                                
+                                var parentID = item[0].parentID;
                                 
                                 for (var i = 0; i < item.length; i++) {
@@ -496 +529 @@
                                                                         var delobj = JSON.stringify(item);
                                                                         var postdata = {delobj:delobj};
-                                                                        var script = 'deletedir';
+                                                                        var script = 'delete';
                                                                         sendCommand ({
                                                                                 postdata:postdata,
@@ -516 +549 @@
                                                                                 },
                                                                                 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;
-                                                                                                        }
+                                                                                                $(parseData.DIRECTORIES).each(function(index){
+                                                                                                        delete o.data.DIRECTORIES[searchItemByID(this, 'directory')];
                                                                                                 });
-                                                                                                
-                                                                                                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;
+                                                                                                $(parseData.FILES).each(function(index){
+                                                                                                        delete o.data.FILES[searchItemByID(this, 'file')];
+                                                                                                });
                                                                                         }
                                                                                         
                                                                                         o.oTree.setData (o.data.DIRECTORIES);
                                                                                         o.oGrid.setData (o.data);
-                                                                                },
+                                                                                        self.setTreeCurrentNode(parentID);
+                                                                                        o.oGrid.reloadGrid();
+                                                                        },
                                                                                 callbackFail: function(){}
                                                                         });
@@ -556 +579 @@
                                 //then fire action of Grid
                                 treeCurrentNode = treeNode;
-                                if (o.oGrid) o.oGrid.reloadGrid(treeNode);
+                                if (o.oGrid) o.oGrid.reloadGrid();
                         };
                         

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

@@ -18 +18 @@
                         var selectedNode = null;
                         var documentBoundEvent = false;
+                        var self = this;
                         
                         var createNode = function (node) {
-                                
                                 if( !node ) var node = {};
                                 if( node.item == undefined ) node.item = null; //item.id, item.name, item.parentID
@@ -258 +258 @@
 
                         this.refeshTree = function () {
-                                for (var i = 0; i < o.data.length; i++) {
+                                //for (var i = 0; i < o.data.length; i++) {
+                                for (var i in o.data) {
                                         var node = nodeIsExisted(o.data[i].id);
                                         var defaulState = isCollapsedNode(node) ? 0:1;
@@ -287 +288 @@
                                 return treeNodes[0];
                         }
-
-                        this.initialize = function () {
-                                initTree();
-                                return this;
-                        };
+                        
+                        this.createCopyNode = function (data) {
+                                for(var i in data) {
+                                        createNode ({item: data[i]});
+                                }
+                                self.refeshTree();
+                        }
 
                         this.rename = function (key) {
@@ -305 +308 @@
                         }
                         
+                        this.initialize = function () {
+                                initTree();
+                                return this;
+                        };
+                        
                         return this.initialize();
                 }