diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-01-19 10:51:57 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-01-19 10:51:57 +0100 |
| commit | 6e096936e55d928030566dbe6cfa225213aa1977 (patch) | |
| tree | a460f22315762efdd4b5a29cc8589c0e127c73ef /core | |
| parent | 930555bd5e349cddee9905d83d5435ae3b7a1ea4 (diff) | |
| download | nextcloud-server-6e096936e55d928030566dbe6cfa225213aa1977.tar.gz nextcloud-server-6e096936e55d928030566dbe6cfa225213aa1977.zip | |
update JS humanFileSize to use KB instead of kB
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/js.js | 6 | ||||
| -rw-r--r-- | core/js/tests/specs/coreSpec.js | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/js/js.js b/core/js/js.js index 2937d3f6eb1..d24a46fc0bb 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1449,7 +1449,7 @@ $.fn.filterAttr = function(attr_name, attr_value) { * @return {string} */ function humanFileSize(size, skipSmallSizes) { - var humanList = ['B', 'kB', 'MB', 'GB', 'TB']; + var humanList = ['B', 'KB', 'MB', 'GB', 'TB']; // Calculate Log with base 1024: size = 1024 ** order var order = size > 0 ? Math.floor(Math.log(size) / Math.log(1024)) : 0; // Stay in range of the byte sizes that are defined @@ -1458,9 +1458,9 @@ function humanFileSize(size, skipSmallSizes) { var relativeSize = (size / Math.pow(1024, order)).toFixed(1); if(skipSmallSizes === true && order === 0) { if(relativeSize !== "0.0"){ - return '< 1 kB'; + return '< 1 KB'; } else { - return '0 kB'; + return '0 KB'; } } if(order < 2){ diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index f653fc88637..2e970f7e707 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -524,7 +524,7 @@ describe('Core base tests', function() { ["0", '0 B'], ["A", 'NaN B'], [125, '125 B'], - [128000, '125 kB'], + [128000, '125 KB'], [128000000, '122.1 MB'], [128000000000, '119.2 GB'], [128000000000000, '116.4 TB'] @@ -535,9 +535,9 @@ describe('Core base tests', function() { }); it('renders file sizes with the correct unit for small sizes', function() { var data = [ - [0, '0 kB'], - [125, '< 1 kB'], - [128000, '125 kB'], + [0, '0 KB'], + [125, '< 1 KB'], + [128000, '125 KB'], [128000000, '122.1 MB'], [128000000000, '119.2 GB'], [128000000000000, '116.4 TB'] |