upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Merge pull request #14890 from nextcloud/stable14-14886

Browse source 
[stable14] Fix opening folders from different file lists
This commit is contained in:
Roeland Jago Douma 2019-03-29 13:31:47 +01:00 committed by GitHub
commit ed0e18fb89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/files/js/fileactions.js
View file

@ -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({