You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ay...@apache.org on 2020/04/15 17:38:16 UTC
[hadoop] branch trunk updated: HDFS-15277. Parent directory in the
explorer does not support all path formats. Contributed by Jianfei Jiang.
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new cc5c1da HDFS-15277. Parent directory in the explorer does not support all path formats. Contributed by Jianfei Jiang.
cc5c1da is described below
commit cc5c1da7c1c29618b5df785d9f1d7a0b737eced1
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Wed Apr 15 23:01:58 2020 +0530
HDFS-15277. Parent directory in the explorer does not support all path formats. Contributed by Jianfei Jiang.
---
.../hadoop-hdfs-rbf/src/main/webapps/router/explorer.js | 14 +++++++++-----
.../hadoop-hdfs/src/main/webapps/hdfs/explorer.js | 10 +++++++---
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.js b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.js
index d2f3729..6917b70 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.js
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.js
@@ -300,6 +300,11 @@
}
function browse_directory(dir) {
+ if (dir.match('^/+$')) {
+ $('#parentDir').prop('disabled', true);
+ } else {
+ $('#parentDir').prop('disabled', false);
+ }
var HELPERS = {
'helper_date_tostring' : function (chunk, ctx, bodies, params) {
var value = dust.helpers.tap(params.value, chunk, ctx);
@@ -378,11 +383,10 @@
$('#parentDir').click(function () {
- var current = current_directory;
- var lastIndex = current.lastIndexOf('/');
- var parent = current.substr(0, lastIndex);
- browse_directory(parent);
- })
+ var current = current_directory;
+ var parent = current.replace(/\/+[^/]+\/*$/,"") || '/';
+ browse_directory(parent);
+ });
function init() {
dust.loadSource(dust.compile($('#tmpl-explorer').html(), 'explorer'));
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
index f1a5f4a..cc55567 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
@@ -300,6 +300,11 @@
}
function browse_directory(dir) {
+ if (dir.match('^/+$')) {
+ $('#parentDir').prop('disabled', true);
+ } else {
+ $('#parentDir').prop('disabled', false);
+ }
var HELPERS = {
'helper_date_tostring' : function (chunk, ctx, bodies, params) {
var value = dust.helpers.tap(params.value, chunk, ctx);
@@ -378,10 +383,9 @@
$('#parentDir').click(function () {
var current = current_directory;
- var lastIndex = current.lastIndexOf('/');
- var parent = current.substr(0, lastIndex);
+ var parent = current.replace(/\/+[^/]+\/*$/,"") || '/';
browse_directory(parent);
- })
+ });
function init() {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org