diff --git a/src/_h5ai/client/css/inc/info.less b/src/_h5ai/client/css/inc/info.less index fda0fd17..0f5a3253 100644 --- a/src/_h5ai/client/css/inc/info.less +++ b/src/_h5ai/client/css/inc/info.less @@ -42,7 +42,7 @@ margin-bottom: 16px; } - .time, .size { + .time, .size, .content { line-height: 20px; height: 20px; } diff --git a/src/_h5ai/client/js/inc/ext/info.js b/src/_h5ai/client/js/inc/ext/info.js index 0435e0ac..38ab4e47 100644 --- a/src/_h5ai/client/js/inc/ext/info.js +++ b/src/_h5ai/client/js/inc/ext/info.js @@ -12,6 +12,10 @@ modulejs.define('ext/info', ['_', '$', 'modernizr', 'core/settings', 'core/resou '
' + '
' + '
' + + '
' + + ' , ' + + ' ' + + '
' + '
' + '
' + '
'; @@ -24,7 +28,7 @@ modulejs.define('ext/info', ['_', '$', 'modernizr', 'core/settings', 'core/resou '
'; var sepTemplate = ''; var storekey = 'ext/info'; - var $img, $label, $time, $size, $qrcode; + var $img, $label, $time, $size, $content, $folders, $files, $qrcode; var currentFolder; // @@ -63,15 +67,21 @@ modulejs.define('ext/info', ['_', '$', 'modernizr', 'core/settings', 'core/resou } else { $time.text('.'); } + if (_.isNumber(item.size)) { - $size.text(format.formatSize(item.size) + ' (' + item.size + ' B)'); + $size.text(format.formatSize(item.size)); + $size.show(); } else { - $size.text('.'); + $size.hide(); } - if (item.isFolder()) { + if (item.isContentFetched) { var stats = item.getStats(); - $size.append(' - ' + stats.folders + ' - ' + stats.files); + $folders.text(stats.folders); + $files.text(stats.files); + $content.show(); + } else { + $content.hide(); } if (settings.qrcode) { @@ -112,6 +122,9 @@ modulejs.define('ext/info', ['_', '$', 'modernizr', 'core/settings', 'core/resou $label = $info.find('.label'); $time = $info.find('.time'); $size = $info.find('.size'); + $content = $info.find('.content'); + $folders = $info.find('.folders'); + $files = $info.find('.files'); $qrcode = $info.find('.qrcode'); if (!settings.qrcode) {