Fix opening folders from different file lists

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 8ce8eddb0b052248238af83ebeb90f3eb5714691..ba29b9096f429a3a000e645a735f2535083467cc 100644 (file)
--- 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({