diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-03-27 17:44:54 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-03-27 17:44:54 +0100 |
| commit | 6b2a212c698a49977b7b4216ce167661cb0f62af (patch) | |
| tree | 6b992da7eec0931942ae1b8b14211690f7ee07a3 /apps/files | |
| parent | 448699502851a60883faf5f0d5cea4a9855bec66 (diff) | |
| download | nextcloud-server-6b2a212c698a49977b7b4216ce167661cb0f62af.tar.gz nextcloud-server-6b2a212c698a49977b7b4216ce167661cb0f62af.zip | |
Fix opening folders from different file lists
Signed-off-by: Julius Härtl <jus@bitgrid.net>
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 a844fba40a3..bb91842fa81 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -671,7 +671,12 @@ icon: '', actionHandler: 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)); + } }, displayName: t('files', 'Open') }); |