diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-24 01:01:36 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-24 01:01:36 +0200 |
| commit | c517c845f6c4d1199e1485adb8947e01602659e5 (patch) | |
| tree | c587821a0440db48808c64ddcfbd1fa2c5451efe /core/js/js.js | |
| parent | cfac7fcd53974ddf20ddb75a0cb3b5a73047568a (diff) | |
| parent | 5fc0535f1b6d94140eed2234e4cb6e38219a74d1 (diff) | |
| download | nextcloud-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 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/js/js.js b/core/js/js.js index 5158b66d73a..cf4e72324dc 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -666,8 +666,6 @@ $(document).ready(function(){ $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); $('a.delete').tipsy({gravity: 'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); - $('#headerSize').tipsy({gravity:'s', fade:true, live:true}); - $('td.filesize').tipsy({gravity:'s', fade:true, live:true}); $('td .modified').tipsy({gravity:'s', fade:true, live:true}); $('input').tipsy({gravity:'w', fade:true}); @@ -697,14 +695,6 @@ function humanFileSize(size) { return relativeSize + ' ' + readableFormat; } -function simpleFileSize(bytes) { - var mbytes = Math.round(bytes/(1024*1024/10))/10; - if(bytes == 0) { return '0'; } - else if(mbytes < 0.1) { return '< 0.1'; } - else if(mbytes > 1000) { return '> 1000'; } - else { return mbytes.toFixed(1); } -} - function formatDate(date){ if(typeof date=='number'){ date=new Date(date); |