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

Timestamp:

Aug 7, 2014 5:37:02 PM (11 years ago)

Author:

dungnv

Message:

 

Location:

pro-bachkim-filespace/sourcecode/assets/js

Files:

• vsgrid.js (modified) (4 diffs)
• vstree.js (modified) (2 diffs)

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

@@ -65 +65 @@
                                                         break;
                                         }
-                                        
                                 });
                         }
@@ -107 +106 @@
                                 $('#box-newfolder').on('show.bs.modal', function () {
                                         $('#box-newfolder').find('#frm-newfolder').get(0).reset();
+                                        
+                                });
+                                
+                                $('#box-newfolder').on('shown.bs.modal', function () {
+                                        $('#box-newfolder').find('#frm-newfolder').find('#f-newfoldername').focus();
                                 });
                                 
@@ -209 +213 @@
                         var searchItemByID = function (itemID, type) {
                                 var source = (type == 'directory') ? o.directoryTreeData.DIRECTORIES : (type == 'file') ? o.directoryTreeData.FILES : null;
-                                var item = null;
-                                for (var i = 0 ; i < source.length; i++) {
-                                        if (source[i].id == itemID) {
-                                                item = source[i];
-                                                break;
-                                        }
-                                }
+                                var item = {};
+                                if (itemID == 0) {
+                                        item.id = 0;
+                                        item.parentID = 0;
+                                        item.name = 'Home';
+                                }
+                                else {
+                                        for (var i = 0 ; i < source.length; i++) {
+                                                if (source[i].id == itemID) {
+                                                        item = source[i];
+                                                        break;
+                                                }
+                                        }
+                                }
+                                
+                                item.type = type;
                                 return item;
                         }
@@ -224 +237 @@
                                 var childDir = o.directoryTreeData.DIRECTORIES;
                                 var childFile = o.directoryTreeData.FILES;
-                                var curentDirID = o.curentParent.substring(o.dirIDprefix.length, o.curentParent.length);
+                                var currentDirID = o.curentParent.substring(o.dirIDprefix.length, o.curentParent.length);
+                                
+                                var disabledItemsList = ['preview','rename','copy','cut','delete','open'];
+                                var item = searchItemByID(currentDirID,'directory');
+                                console.log(item);
+                                $(o.container).contextMenu({
+                                        menu: 'gridMenuParent',
+                                        disabledItems: disabledItemsList
+                                }, function(action, el, pos) {
+                                        switch(action) {
+                                                case 'newfolder':
+                                                        openNewFolderModal(item);
+                                                        break;
+                                                case 'share':
+                                                        showShareModal(item);
+                                                        break;
+                                                default:
+                                                        break;
+                                        }
+                                });
                                 
                                 for (var i = 0 ; i < childDir.length; i++) {
-                                        if (childDir[i].parentID != curentDirID) continue;
+                                        if (childDir[i].parentID != currentDirID) continue;
                                         createNode ({
                                                 id: childDir[i].id,
                                                 name: childDir[i].name,
-                                                parentID: curentDirID,
+                                                parentID: currentDirID,
                                         });
                                 }
                                 
                                 for (var i = 0 ; i < childFile.length; i++) {
-                                        if (childFile[i].parentID != curentDirID) continue;
+                                        if (childFile[i].parentID != currentDirID) continue;
                                         createNode ({
                                                 id: childFile[i].id,
                                                 name: childFile[i].name,
-                                                parentID: curentDirID,
+                                                parentID: currentDirID,
                                                 minetype: childFile[i].minetype,
                                         });

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

@@ -289 +289 @@
                         this.createDir = function(data) {
                                 var cNode = $('#' + o.dirIDprefix + data.parentID).find('> A');
-                                
                                 createNode({
                                         id: data.id,
@@ -296 +295 @@
                                         hidden: false,
                                         addToJSONData:true});
-                                
-                                //console.log($(o.container).find(cNode).parent().attr('id').substring(o.dirIDprefix.length, $(cNode).parent().attr('id').length));
                         }