diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-03-29 15:31:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 15:31:47 +0300 |
| commit | ed0e18fb8993213ab1269ae417ebdc0d8e6dc0d9 (patch) | |
| tree | 52fae58a0cec601307c9fd6689acb5e91db3e950 | |
| parent | f105bc53b912df29f5ffb23a331e38dbf530b5ce (diff) | |
| parent | c1bad831cd4ac2a6a85325b3bba75e72df60e246 (diff) | |
Merge pull request #14890 from nextcloud/stable14-14886
[stable14] Fix opening folders from different file lists
| -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 8ce8eddb0b0..ba29b9096f4 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -675,7 +675,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({ |