]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #5399 from frisco82/fixDownloadOverQuota
authorMorris Jobke <morris.jobke@gmail.com>
Wed, 6 Nov 2013 21:59:27 +0000 (13:59 -0800)
committerMorris Jobke <morris.jobke@gmail.com>
Wed, 6 Nov 2013 21:59:27 +0000 (13:59 -0800)
Do not count the size of shared folder on total

1  2 
apps/files/js/filelist.js

index 006bd1f4966e0789837a33ec1de2786a623480c0,8abb28e93957577f731b2654fb32c53cfc2966ee..f11cba6230bd838d2d7ccc6f0f087fcd88c665aa
@@@ -598,21 -575,20 +586,21 @@@ var FileList=
                        var info = t('files', '{dirs} and {files}', infoVars);
  
                        // don't show the filesize column, if filesize is NaN (e.g. in trashbin)
-                       if (isNaN(totalSize)) {
+                       if (isNaN(summary.totalSize)) {
                                var fileSize = '';
                        } else {
-                               var fileSize = '<td class="filesize">'+humanFileSize(totalSize)+'</td>';
+                               var fileSize = '<td class="filesize">'+humanFileSize(summary.totalSize)+'</td>';
                        }
  
 -                      $('#fileList').append('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
 +                      var $summary = $('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
 +                      $('#fileList').append($summary);
  
 -                      var $dirInfo = $('.summary .dirinfo');
 -                      var $fileInfo = $('.summary .fileinfo');
 -                      var $connector = $('.summary .connector');
 +                      var $dirInfo = $summary.find('.dirinfo');
 +                      var $fileInfo = $summary.find('.fileinfo');
 +                      var $connector = $summary.find('.connector');
  
                        // Show only what's necessary, e.g.: no files: don't show "0 files"
 -                      if ($dirInfo.html().charAt(0) === "0") {
 +                      if (totalDirs === 0) {
                                $dirInfo.hide();
                                $connector.hide();
                        }