summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-10-21 17:41:03 +0200
committerkondou <kondou@ts.unde.re>2013-10-21 17:59:51 +0200
commit7864a3bf07fab1183bc003e771ee365fc1376c73 (patch)
tree26690c125db0ed1f4fec4dd999b81026927d2b34 /apps/files
parent40cc57ab3e34a99ec28485fd76a7b052b0da17aa (diff)
downloadnextcloud-server-7864a3bf07fab1183bc003e771ee365fc1376c73.tar.gz
nextcloud-server-7864a3bf07fab1183bc003e771ee365fc1376c73.zip
Fix shared folder still showing fileheader
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/index.php2
-rw-r--r--apps/files/js/filelist.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/index.php b/apps/files/index.php
index 7db3fd96380..22240deadca 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -119,7 +119,7 @@ if ($needUpgrade) {
}
$isCreatable = \OC\Files\Filesystem::isCreatable($dir . '/');
- $emptyContent = (!isset($files) or !$isCreatable or count($files) > 0 or $ajaxLoad);
+ $emptyContent = (!isset($files) or count($files) > 0 or $ajaxLoad);
OCP\Util::addscript('files', 'fileactions');
OCP\Util::addscript('files', 'files');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 9b66a2e69ae..20930b2dce8 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -623,8 +623,8 @@ var FileList={
var $fileList = $('#fileList');
var permissions = $('#permissions').val();
var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
- $('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').length > 0);
- $('#filestable th').toggleClass('hidden', isCreatable && $fileList.find('tr').length === 0);
+ $('#emptycontent').toggleClass('hidden', $fileList.find('tr').length > 0);
+ $('#filestable th').toggleClass('hidden', $fileList.find('tr').length === 0);
},
showMask: function(){
// in case one was shown before