Changeset 825

Timestamp:

Mar 25, 2015 5:22:32 PM (10 years ago)

Author:

dungnv

Message:

 

Location:

pro-violet-viettel/www/deploy/20150304

Files:

• application/modules/ajax/controllers/privatecontent.php (modified) (1 diff)
• assets/js/grid.js (modified) (6 diffs)
• assets/js/manager.js (modified) (3 diffs)

pro-violet-viettel/www/deploy/20150304/application/modules/ajax/controllers/privatecontent.php

@@ -72 +72 @@
                         if (is_array($this->xml->tree->filelist->file)) {
                                 foreach($this->xml->tree->filelist->file as $key=>$value){
-                                        $aryFiles[] = array('thumbnail' => $value->_param['thumbnail'],'fileurl' => $value->_param['fileurl'], 'id' => $value->_param['id'], 'name' => $value->_value, 'parentID' => $value->_param['parentid'] == -1 ? 0:$value->_param['parentid'], 'minetype' => $value->_param['filetype']);
+                                        $aryFiles[] = array('thumbnail' => $value->_param['thumbnail'],'fileurl' => $value->_param['fileurl'], 'id' => $value->_param['id'], 'name' => $value->_value, 'parentID' => $value->_param['parentid'] == -1 ? 0:$value->_param['parentid'], 'minetype' => $value->_param['filetype'], 'size' => $value->_param['size']);
                                 }
                         }else {
                                 $file = $this->xml->tree->filelist->file;
-                                $aryFiles[] = array('thumbnail' => $value->_param['thumbnail'],'fileurl' => $value->_param['fileurl'],'id' => $file->_param['id'], 'name' => $file->_value,'parentID' => $file->_param['parentid'] == -1 ? 0:$file->_param['parentid'], 'minetype' => $file->_param['filetype']);
+                                $aryFiles[] = array('thumbnail' => $value->_param['thumbnail'],'fileurl' => $value->_param['fileurl'],'id' => $file->_param['id'], 'name' => $file->_value,'parentID' => $file->_param['parentid'] == -1 ? 0:$file->_param['parentid'], 'minetype' => $file->_param['filetype'], 'size' => $file->_param['size']);
                         }
                 }

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

@@ -46 +46 @@
                                 
                                 var a = $('<a></a>',{id: node.item.id,href: '#',rel: node.item.name,text: node.item.name});
+                                //var nameplace = $('<div></div>',{id: node.item.id,rel: node.item.name,text: node.item.name});
                                 var divLink = $('<div></div>',{'class':'file-name'}).append(a,inputID,inputName,inputParent,inputType,inputFileUrl);                            
                                 var li = $('<li></li>',{'class':'vscell',id:typeid+node.item.id}).append(div, divLink);
@@ -66 +67 @@
                         }
                         
-                        var nodeClick = function (node, event) {
+                        var nodeClick = function (node, event) {                                
                                 if (event.ctrlKey) {
                                         if (!isHightLight(node))
@@ -82 +83 @@
                                 else {
                                         clearAllHightLightNode(node);
-                                        hightlightNode(node);
+                                        hightlightNode(node);                                   
                                 }
                         }
@@ -95 +96 @@
                                                         minetype: $(node).find('> DIV[class^="file-name"] > INPUT[type="hidden"][class^="type"]').val()};
                                 
-                                o.manager.gridNodeDblClick(nodeObj);                            
+                                o.manager.gridNodeDblClick(nodeObj);
                         }
                         
@@ -170 +171 @@
                          ******************/
                         var renameInit = function (node) {                              
-                                console.log(node);
                                 var editor = $('<input />',{'class':'rename', type: 'text', value:$(node).text()});
                                 $(editor).bind('focusout', function(e){renameCancel(node)});
@@ -184 +184 @@
                                 $(node).append(editor);
                                 $(editor).focus();
-                                $(editor).select();
+                                //$(editor).select();
                         }
                         

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

@@ -65 +65 @@
 
                 var toolbarButtons = [btnNewFolder, btnDel, btnCopy, btnCut, btnPaste, btnShare, btnPreview, btnDownload, btnUpload, btnRefresh];
+                var statusbar = $('DIV#' + o.statusbar);
                 
                 var sendCommand = function (p) {
@@ -137 +138 @@
                     if (o.invisibledButtons != null) {
                         for (var i = 0; i < o.invisibledButtons.length; i++) {
-                                $('#' + o.toolsbar + ' > DIV.btn-group.basic > #' + o.invisibledButtons[i]).hide();
+                                $('#' + o.invisibledButtons[i]).hide();
                         }
                     }
@@ -965 +966 @@
                     return searchItemByID(parentID, type);
                 }
+                
+                this.refreshStatusBar = function (message) {
+                        $(statusbar).text(message);
+                }
 
                 this.initialize = function () {