From e928a342c452b49ed84e36d3534bb9715f55845b Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 28 Dec 2012 20:10:01 -0500 Subject: Check if extra / is necessary for the folder URL --- apps/files/js/fileactions.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'apps/files/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index e1d8b60d315..533b11a6e50 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -190,7 +190,11 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () { FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) { - window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent($('#dir').val()).replace(/%2F/g, '/') + '/' + encodeURIComponent(filename); + var dir = encodeURIComponent($('#dir').val()).replace(/%2F/g, '/'); + if (dir != '/') { + dir = dir + '/'; + } + window.location = OC.linkTo('files', 'index.php') + '?dir=' + dir + encodeURIComponent(filename); }); FileActions.setDefault('dir', 'Open'); -- cgit v1.2.3 From 855c9480b73d0ea3f6d0562503db5d72f64c14db Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Sat, 9 Feb 2013 13:07:44 +0100 Subject: only encodeURIComponent once --- apps/files/js/fileactions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 533b11a6e50..316acda5133 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -190,11 +190,11 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () { FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) { - var dir = encodeURIComponent($('#dir').val()).replace(/%2F/g, '/'); + var dir = $('#dir').val() if (dir != '/') { dir = dir + '/'; } - window.location = OC.linkTo('files', 'index.php') + '?dir=' + dir + encodeURIComponent(filename); + window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename); }); FileActions.setDefault('dir', 'Open'); -- cgit v1.2.3 From 89dc8be9f550310f86e2e7da9cdb1da630080f49 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 28 Jun 2013 21:00:09 +0200 Subject: update to !== --- apps/files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 316acda5133..fac0ed1ff9b 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -191,7 +191,7 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () { FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) { var dir = $('#dir').val() - if (dir != '/') { + if (dir !== '/') { dir = dir + '/'; } window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename); -- cgit v1.2.3