diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-01-05 14:53:38 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-05 14:53:38 +0100 |
commit | 578c930f41ed0b3380fadfa2d1f6cb2f97540534 (patch) | |
tree | bd5ff6563e1bfe8baf4e01b56976e93cfd7407c3 /app/assets/javascripts/projects/project_new.js | |
parent | f4c2eeb2a6885821f8b72f46deb49a55a062bd8c (diff) | |
parent | 6c2a35fe4865a50338b38f89279813130c0a6cba (diff) | |
download | gitlab-ce-578c930f41ed0b3380fadfa2d1f6cb2f97540534.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 41563-fix-branch-creation-from-issue-in-firefox
Diffstat (limited to 'app/assets/javascripts/projects/project_new.js')
-rw-r--r-- | app/assets/javascripts/projects/project_new.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 3ecc0c2a6e5..4710e70d619 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -1,6 +1,7 @@ let hasUserDefinedProjectPath = false; -const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => { +const deriveProjectPathFromUrl = ($projectImportUrl) => { + const $currentProjectPath = $projectImportUrl.parents('.toggle-import-form').find('#project_path'); if (hasUserDefinedProjectPath) { return; } @@ -21,7 +22,7 @@ const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => { // extract everything after the last slash const pathMatch = /\/([^/]+)$/.exec(importUrl); if (pathMatch) { - $projectPath.val(pathMatch[1]); + $currentProjectPath.val(pathMatch[1]); } }; @@ -96,7 +97,7 @@ const bindEvents = () => { hasUserDefinedProjectPath = $projectPath.val().trim().length > 0; }); - $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl, $projectPath)); + $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl)); }; document.addEventListener('DOMContentLoaded', bindEvents); |