Skip to content

Commit c41083c

Browse files
author
Jonas Sciangula Street
committed
added changes for this pr
1 parent 4a682c9 commit c41083c

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

dist/angular-filemanager.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/filters/filters.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
}]);
2121

2222
app.filter('humanReadableFileSize', ['$filter', 'fileManagerConfig', function($filter, fileManagerConfig) {
23-
2423
// See https://en.wikipedia.org/wiki/Binary_prefix
2524
var decimalByteUnits = [' kB', ' MB', ' GB', ' TB', 'PB', 'EB', 'ZB', 'YB'];
2625
var binaryByteUnits = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
2726

2827
return function(input) {
29-
3028
var i = -1;
3129
var fileSizeInBytes = input;
3230

@@ -35,7 +33,8 @@
3533
i++;
3634
} while (fileSizeInBytes > 1024);
3735

38-
return Math.max(fileSizeInBytes, 0.1).toFixed(1) + ' ' + (fileManagerConfig.useBinarySizePrefixes ? binaryByteUnits[i] : decimalByteUnits[i]);
36+
var result = fileManagerConfig.useBinarySizePrefixes ? binaryByteUnits[i] : decimalByteUnits[i];
37+
return Math.max(fileSizeInBytes, 0.1).toFixed(1) + ' ' + result;
3938
};
4039
}]);
4140
})(angular);

src/js/providers/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
},
3838

3939
showSizeForDirectories: false,
40+
useBinarySizePrefixes: false,
4041

4142
previewImagesInModal: true,
4243
enablePermissionsRecursive: true,

src/templates/main-icons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="iconset clearfix">
22
<div class="col-120" ng-repeat="item in fileNavigator.fileList | filter: query | orderBy: orderProp" ng-show="!fileNavigator.requesting && !fileNavigator.error">
3-
<a href="" class="thumbnail text-center" ng-click="smartClick(item)" ng-right-click="touch(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
3+
<a href="" class="thumbnail text-center" ng-click="smartClick(item)" ng-right-click="touch(item)" title="{{item.model.name}} ({{item.model.size | humanReadableFileSize}})">
44
<div class="item-icon">
55
<i class="glyphicon glyphicon-folder-open" ng-show="item.model.type === 'dir'"></i>
66
<i class="glyphicon glyphicon-file" ng-show="item.model.type === 'file'"></i>

src/templates/main-table-modal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</tr>
3232
<tr ng-repeat="item in fileNavigator.fileList | orderBy:predicate:reverse" ng-show="!fileNavigator.requesting && item.model.type === 'dir'">
3333
<td>
34-
<a href="" ng-click="fileNavigator.folderClick(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
34+
<a href="" ng-click="fileNavigator.folderClick(item)" title="{{item.model.name}} ({{item.model.size | humanReadableFileSize}})">
3535
<i class="glyphicon glyphicon-folder-close"></i>
3636
{{item.model.name | strLimit : 32}}
3737
</a>

src/templates/main-table.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</tr>
4747
<tr ng-repeat="item in fileNavigator.fileList | filter: {model:{name: query}} | orderBy:predicate:reverse" ng-show="!fileNavigator.requesting">
4848
<td ng-right-click="touch(item)">
49-
<a href="" ng-click="smartClick(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
49+
<a href="" ng-click="smartClick(item)" title="{{item.model.name}} ({{item.model.size | humanReadableFileSize}})">
5050
<i class="glyphicon glyphicon-folder-close" ng-show="item.model.type === 'dir'"></i>
5151
<i class="glyphicon glyphicon-file" ng-show="item.model.type === 'file'"></i>
5252
{{item.model.name | strLimit : 64}}

0 commit comments

Comments
 (0)