Changeset 839

Timestamp:

Mar 27, 2015 10:12:35 AM (10 years ago)

Author:

dungnv

Message:

 

File:

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

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

@@ -130 +130 @@
                 var layoutRender = function () {
                     var scrWidth = $('#' + o.maincontainer).width();
-                    var scrHeght = $(window).height();
-                    var dirTreeHeight = scrHeght - $('#' + o.titlebar).height() - $('#' + o.toolsbar).height() - $('#' + o.statusbar).height() - 2;
+                    var scrHeght = $(window).innerHeight();
+                    var dirTreeHeight = scrHeght - $('#' + o.titlebar).height() - $('#' + o.toolsbar).height() - $('#' + o.statusbar).height() -5;
                     $('#' + o.tree).parent().height(dirTreeHeight);
                     $('#' + o.grid).parent().height(dirTreeHeight);
@@ -973 +973 @@
                         var items = o.oGrid.getHightLightItem();
                         var message = '';
-                        if (items.length == 1) {
+                        if (items.length == 1 && items[0].type= 'file') {
                                 message = 'FILE: ' + items[0].name;
-                                message += ' - SIZE: ' + self.formatFileSize(items[0].size, null);
+                                message += ' - SIZE: ' + self.formatFileSize(items[0].size);
                         }
                         $(statusbar).text(message);
@@ -988 +988 @@
                 }
                 
-                        this.formatFileSize = function (size, opts) {
+                        this.formatFileSize = function (size) {
                         var i;
                         i = Math.floor(Math.log(size) / Math.log(1024));
@@ -997 +997 @@
                           throw Error("" + size + " did not compute to a valid number to be humanized.");
                         } else {
-                          //if ((opts != null ? opts.abbr : void 0) === true) {
                             return (size / Math.pow(1024, i)).toFixed(2) * 1 + " " + ["B", "kB", "MB", "GB", "TB", "PB"][i];
-                          /*} else {
-                            return (size / Math.pow(1024, i)).toFixed(2) * 1 + " " + ["bytes", "kilobytes", "megabytes", "gigabytes", "terabytes", "petabytes"][i];
                           }*/
                         }