diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-03-29 13:32:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 13:32:01 +0100 |
| commit | e953ea47eada18f3a375d21c1537f0116384c5ab (patch) | |
| tree | 03d551dcbd27f0fa13a4060c7ec8b58fd998c423 /apps/files | |
| parent | aafedb9728b0d75f655c09e4a297f4c4bd8838e0 (diff) | |
| parent | 8ac03c67a783ca1c59ac0c8dc7eaf000a9919996 (diff) | |
| download | nextcloud-server-e953ea47eada18f3a375d21c1537f0116384c5ab.tar.gz nextcloud-server-e953ea47eada18f3a375d21c1537f0116384c5ab.zip | |
Merge pull request #14891 from nextcloud/stable15-14886
[stable15] Fix opening folders from different file lists
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/fileactions.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 2981fb64c11..6ff04c2eb05 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -661,7 +661,12 @@ this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) { var dir = context.$file.attr('data-path') || context.fileList.getCurrentDirectory(); - context.fileList.changeDirectory(OC.joinPaths(dir, filename), true, false, parseInt(context.$file.attr('data-id'), 10)); + if (OCA.Files.App.getActiveView() !== 'files') { + OCA.Files.App.setActiveView('files'); + OCA.Files.App.fileList.changeDirectory(OC.joinPaths(dir, filename), true, true); + } else { + context.fileList.changeDirectory(OC.joinPaths(dir, filename), true, false, parseInt(context.$file.attr('data-id'), 10)); + } }); this.registerAction({ |