From b5cfbe4c08343a261c5b95c3c030a2da0cb6e17e Mon Sep 17 00:00:00 2001 From: GyuYong Jung Date: Mon, 29 Jan 2018 02:47:22 +0900 Subject: [PATCH] Fix not escaped branch in URL (#486) fixes: #482 --- src/adapters/adapter.js | 6 +++--- src/adapters/bitbucket.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/adapters/adapter.js b/src/adapters/adapter.js index d77f8b0..ec3d0f8 100644 --- a/src/adapters/adapter.js +++ b/src/adapters/adapter.js @@ -138,7 +138,7 @@ class Adapter { } else { // encodes but retains the slashes, see #274 const encodedPath = path.split('/').map(encodeURIComponent).join('/') - const url = this._getItemHref(repo, type, encodedPath) + const url = this._getItemHref(repo, type, encodedPath, opts.encodedBranch) item.a_attr = { href: url, 'data-download-url': url, @@ -371,8 +371,8 @@ class Adapter { * Returns item's href value. * @api protected */ - _getItemHref(repo, type, encodedPath) { - return `/${repo.username}/${repo.reponame}/${type}/${repo.branch}/${encodedPath}` + _getItemHref(repo, type, encodedPath, encodedBranch) { + return `/${repo.username}/${repo.reponame}/${type}/${encodedBranch}/${encodedPath}` } /** * Returns patch's href value. diff --git a/src/adapters/bitbucket.js b/src/adapters/bitbucket.js index 88b8970..f76afea 100644 --- a/src/adapters/bitbucket.js +++ b/src/adapters/bitbucket.js @@ -202,7 +202,7 @@ class Bitbucket extends PjaxAdapter { } // @override - _getItemHref(repo, type, encodedPath) { - return `/${repo.username}/${repo.reponame}/src/${repo.branch}/${encodedPath}` + _getItemHref(repo, type, encodedPath, encodedBranch) { + return `/${repo.username}/${repo.reponame}/src/${encodedBranch}/${encodedPath}` } }