diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 00:37:05 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 00:37:05 +0200 |
| commit | f658852276204fbf1a76d58ac2f585cf9db8c75d (patch) | |
| tree | 5fbd6d93c7435022e8539065a45469bd249799ad /apps/files/js/files.js | |
| parent | 085fdfec2f298fd89d0265d0f97edfdda5a12954 (diff) | |
| parent | 7c6246fa451c4646dfaa1396dd37e0b3eb9706ba (diff) | |
| download | nextcloud-server-f658852276204fbf1a76d58ac2f585cf9db8c75d.tar.gz nextcloud-server-f658852276204fbf1a76d58ac2f585cf9db8c75d.zip | |
Merge branch 'master' into fixing-testGetById-master
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 51b3f31fb96..3fad3fae7d3 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -121,7 +121,7 @@ $(document).ready(function() { }); // Show trash bin - $('#trash a').live('click', function() { + $('#trash').on('click', function() { window.location=OC.filePath('files_trashbin', '', 'index.php'); }); @@ -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){ @@ -847,3 +845,11 @@ function getUniqueName(name){ } return name; } + +function checkTrashStatus() { + $.post(OC.filePath('files_trashbin', 'ajax', 'isEmpty.php'), function(result){ + if (result.data.isEmpty === false) { + $("input[type=button][id=trash]").removeAttr("disabled"); + } + }); +}
\ No newline at end of file |