Properly join path sections
This prevents double slashes that can mess up path comparisons in some cases.
This commit is contained in:
parent
7ec83fc9fb
commit
ec3166742b
|
@ -92,7 +92,7 @@
|
||||||
// folder in the files app instead of opening it directly
|
// folder in the files app instead of opening it directly
|
||||||
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
||||||
OCA.Files.App.setActiveView('files', {silent: true});
|
OCA.Files.App.setActiveView('files', {silent: true});
|
||||||
OCA.Files.App.fileList.changeDirectory(context.$file.attr('data-path') + '/' + filename, true, true);
|
OCA.Files.App.fileList.changeDirectory(OC.joinPaths(context.$file.attr('data-path'), filename), true, true);
|
||||||
});
|
});
|
||||||
fileActions.setDefault('dir', 'Open');
|
fileActions.setDefault('dir', 'Open');
|
||||||
return fileActions;
|
return fileActions;
|
||||||
|
|
|
@ -612,10 +612,7 @@
|
||||||
|
|
||||||
this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
||||||
var dir = context.$file.attr('data-path') || context.fileList.getCurrentDirectory();
|
var dir = context.$file.attr('data-path') || context.fileList.getCurrentDirectory();
|
||||||
if (dir !== '/') {
|
context.fileList.changeDirectory(OC.joinPaths(dir, filename));
|
||||||
dir = dir + '/';
|
|
||||||
}
|
|
||||||
context.fileList.changeDirectory(dir + filename);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
this.registerAction({
|
this.registerAction({
|
||||||
|
|
|
@ -54,7 +54,7 @@ OCA.External.App = {
|
||||||
// folder in the files app instead of opening it directly
|
// folder in the files app instead of opening it directly
|
||||||
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
||||||
OCA.Files.App.setActiveView('files', {silent: true});
|
OCA.Files.App.setActiveView('files', {silent: true});
|
||||||
OCA.Files.App.fileList.changeDirectory(context.$file.attr('data-path') + '/' + filename, true, true);
|
OCA.Files.App.fileList.changeDirectory(OC.joinPaths(context.$file.attr('data-path'), filename), true, true);
|
||||||
});
|
});
|
||||||
fileActions.setDefault('dir', 'Open');
|
fileActions.setDefault('dir', 'Open');
|
||||||
return fileActions;
|
return fileActions;
|
||||||
|
|
|
@ -142,7 +142,7 @@ OCA.Sharing.App = {
|
||||||
// folder in the files app instead of opening it directly
|
// folder in the files app instead of opening it directly
|
||||||
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
||||||
OCA.Files.App.setActiveView('files', {silent: true});
|
OCA.Files.App.setActiveView('files', {silent: true});
|
||||||
OCA.Files.App.fileList.changeDirectory(context.$file.attr('data-path') + '/' + filename, true, true);
|
OCA.Files.App.fileList.changeDirectory(OC.joinPaths(context.$file.attr('data-path'), filename), true, true);
|
||||||
});
|
});
|
||||||
fileActions.setDefault('dir', 'Open');
|
fileActions.setDefault('dir', 'Open');
|
||||||
return fileActions;
|
return fileActions;
|
||||||
|
|
|
@ -38,10 +38,7 @@ OCA.Trashbin.App = {
|
||||||
var fileActions = new OCA.Files.FileActions();
|
var fileActions = new OCA.Files.FileActions();
|
||||||
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
|
||||||
var dir = context.fileList.getCurrentDirectory();
|
var dir = context.fileList.getCurrentDirectory();
|
||||||
if (dir !== '/') {
|
context.fileList.changeDirectory(OC.joinPaths(dir, filename));
|
||||||
dir = dir + '/';
|
|
||||||
}
|
|
||||||
context.fileList.changeDirectory(dir + filename);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
fileActions.setDefault('dir', 'Open');
|
fileActions.setDefault('dir', 'Open');
|
||||||
|
|
Loading…
Reference in New Issue