From 8ac03c67a783ca1c59ac0c8dc7eaf000a9919996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 27 Mar 2019 17:44:54 +0100 Subject: [PATCH] Fix opening folders from different file lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files/js/fileactions.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 2981fb64c1106..6ff04c2eb058d 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({