diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-06-02 17:37:53 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-06-02 17:37:53 +0200 |
| commit | dd8b7b7af892f16926d0b64bffa59cf616076144 (patch) | |
| tree | cc5c300749dcac85a01ae3f6ae89ef902958ca3c /apps | |
| parent | 51602f67e002dc23342fd7c13d803a98b732e812 (diff) | |
| parent | 5d457dafc1d8a2aafb0d630a7f8a5b56cef7d97b (diff) | |
| download | nextcloud-server-dd8b7b7af892f16926d0b64bffa59cf616076144.tar.gz nextcloud-server-dd8b7b7af892f16926d0b64bffa59cf616076144.zip | |
Merge pull request #8613 from owncloud/filesize-alignment
Improve aligment of file size
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 1b2a62137e5..4229988b171 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -613,7 +613,7 @@ // size column if (typeof(fileData.size) !== 'undefined' && fileData.size >= 0) { - simpleSize = humanFileSize(parseInt(fileData.size, 10)); + simpleSize = humanFileSize(parseInt(fileData.size, 10), true); sizeColor = Math.round(160-Math.pow((fileData.size/(1024*1024)),2)); } else { simpleSize = t('files', 'Pending'); diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 855a5c9af51..7d3bc946dd3 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -252,7 +252,7 @@ describe('OCA.Files.FileList tests', function() { size: '0' }; var $tr = fileList.add(fileData); - expect($tr.find('.filesize').text()).toEqual('0 B'); + expect($tr.find('.filesize').text()).toEqual('0 kB'); }); it('adds new file to the end of the list', function() { var $tr; |