diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 15:45:55 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 15:45:55 +0200 |
| commit | fdeef5e874ae7a8e4a23a737e5a1e948804d768a (patch) | |
| tree | 2cc093162b583210b8f878f5ab9d670c270cff2e /apps/files/js/files.js | |
| parent | 60541358ac375652d74e4a5b5d8cad865833aa92 (diff) | |
| parent | c3f7d22adc59949ad41c33d450b6d3e226cdefdb (diff) | |
| download | nextcloud-server-fdeef5e874ae7a8e4a23a737e5a1e948804d768a.tar.gz nextcloud-server-fdeef5e874ae7a8e4a23a737e5a1e948804d768a.zip | |
Merge branch 'master' into fixing-appframework-master
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 37b66858840..a35ed4add8c 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -703,7 +703,12 @@ function checkTrashStatus() { } function onClickBreadcrumb(e){ - var $el = $(e.target).closest('.crumb'); - e.preventDefault(); - FileList.changeDirectory(decodeURIComponent($el.data('dir'))); + var $el = $(e.target).closest('.crumb'), + $targetDir = $el.data('dir'); + isPublic = !!$('#isPublic').val(); + + if ($targetDir !== undefined && !isPublic){ + e.preventDefault(); + FileList.changeDirectory(decodeURIComponent($targetDir)); + } } |