diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
| commit | e43e8b0db8d1c9935ac49d37255e934e310798c7 (patch) | |
| tree | d228f608b83e1c04ef5b97b0fe4b0a15282343b7 /apps/files/js/filelist.js | |
| parent | 5539b9e843dbd4125ba9bbb3de79d47ef48e059b (diff) | |
| parent | 09187f3b3b30e6f810c6afff7332615ed472154e (diff) | |
| download | nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.tar.gz nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.zip | |
Merge branch 'master' into rename-lostpassword-controller
Conflicts:
core/lostpassword/controller.php
Diffstat (limited to 'apps/files/js/filelist.js')
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 05e31094502..29be5e0d362 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -147,7 +147,7 @@ var FileList={ $('tr').filterAttr('data-file',name).remove(); FileList.updateFileSummary(); if($('tr[data-file]').length==0){ - $('#emptyfolder').show(); + $('#emptycontent').show(); } }, insertElement:function(name,type,element){ @@ -177,7 +177,7 @@ var FileList={ }else{ $('#fileList').append(element); } - $('#emptyfolder').hide(); + $('#emptycontent').hide(); FileList.updateFileSummary(); }, loadingDone:function(name, id){ |