aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/files.js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-24 01:01:36 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-24 01:01:36 +0200
commitc517c845f6c4d1199e1485adb8947e01602659e5 (patch)
treec587821a0440db48808c64ddcfbd1fa2c5451efe /apps/files/js/files.js
parentcfac7fcd53974ddf20ddb75a0cb3b5a73047568a (diff)
parent5fc0535f1b6d94140eed2234e4cb6e38219a74d1 (diff)
downloadnextcloud-server-c517c845f6c4d1199e1485adb8947e01602659e5.tar.gz
nextcloud-server-c517c845f6c4d1199e1485adb8947e01602659e5.zip
Merge branch 'master' into storage-test-cleanup
Conflicts: tests/lib/files/storage/storage.php
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r--apps/files/js/files.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 51b3f31fb96..98fc53b71a9 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -756,9 +756,7 @@ function procesSelection(){
for(var i=0;i<selectedFolders.length;i++){
totalSize+=selectedFolders[i].size;
};
- simpleSize=simpleFileSize(totalSize);
- $('#headerSize').text(simpleSize);
- $('#headerSize').attr('title',humanFileSize(totalSize));
+ $('#headerSize').text(humanFileSize(totalSize));
var selection='';
if(selectedFolders.length>0){
if(selectedFolders.length==1){