From f178c002eea837512363bc099253a3124dde8873 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 10 Mar 2023 00:49:17 +0800 Subject: [PATCH] refactor --- templates/repo/branch_dropdown.tmpl | 128 ++++++++++-------- .../js/components/RepoBranchTagDropdown.js | 59 +++----- web_src/js/features/repo-legacy.js | 2 +- 3 files changed, 90 insertions(+), 99 deletions(-) diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 89d65146a9d62..9379d16bc3a86 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -2,101 +2,111 @@ {{$defaultBranch := $.root.BranchName}}{{if and .root.IsViewTag (not .noTag)}}{{$defaultBranch = .root.TagName}}{{end}}{{if eq $defaultBranch ""}}{{$defaultBranch = $.root.Repository.DefaultBranch}}{{end}} {{$type := ""}}{{if and .root.IsViewTag (not .noTag)}}{{$type = "tag"}}{{else if .root.IsViewBranch}}{{$type = "branch"}}{{else}}{{$type = "tree"}}{{end}} {{$showBranchesInDropdown := not .root.HideBranchesInDropdown}} + + +
-
+
-
- {{if $showBranchesInDropdown}} - {{range .root.Branches}} -
{{.}}
- {{end}} - {{end}} - {{if (not .noTag)}} - {{range .root.Tags}} - {{if $release}} -
{{.}}
- {{else}} -
{{.}}
- {{end}} - {{end}} - {{end}} -
{{svg "octicon-filter" 16}} - +
- {{if $showBranchesInDropdown}} +
-
${ item.name }
-
+
${ item.name }
+
- {{.root.locale.Tr "repo.tag.create_tag" `${ searchTerm }` | Safe}} +
{{svg "octicon-git-branch"}} - {{.root.locale.Tr "repo.branch.create_branch" `${ searchTerm }` | Safe}} +
- {{if or .root.IsViewBranch $release}} - {{.root.locale.Tr "repo.branch.create_from" .root.BranchName}} - {{else if .root.IsViewTag}} - {{.root.locale.Tr "repo.branch.create_from" .root.TagName}} - {{else}} - {{.root.locale.Tr "repo.branch.create_from" (ShortSha .root.CommitID)}} - {{end}} + ${ textCreateBranchFrom.replace('%s', branchName) } + ${ textCreateBranchFrom.replace('%s', tagName) } + ${ textCreateBranchFrom.replace('%s', commitIdShort) }
- {{.root.CsrfTokenHtml}} + - {{if $.root.TreePath}} - - {{end}} +
diff --git a/web_src/js/components/RepoBranchTagDropdown.js b/web_src/js/components/RepoBranchTagDropdown.js index 8bed305fcaec6..33d8fff206a8b 100644 --- a/web_src/js/components/RepoBranchTagDropdown.js +++ b/web_src/js/components/RepoBranchTagDropdown.js @@ -3,43 +3,35 @@ import $ from 'jquery'; import {vueDelimiters} from './VueComponentLoader.js'; export function initRepoBranchTagDropdown(selector) { - $(selector).each(function () { - const $dropdown = $(this); - const $data = $dropdown.find('.data'); + $(selector).each(function (dropdownIndex, elRoot) { const data = { + csrfToken: window.config.csrfToken, items: [], - mode: $data.data('mode'), searchTerm: '', - refName: '', - noResults: '', - canCreateBranch: false, menuVisible: false, createTag: false, + release: null, + isViewTag: false, isViewBranch: false, isViewTree: false, + active: 0, - branchForm: '', - branchURLPrefix: '', - branchURLSuffix: '', - tagURLPrefix: '', - tagURLSuffix: '', - setAction: false, - submitForm: false, + + ...window.config.pageData.branchDropdownDataList[dropdownIndex], }; - $data.find('.item').each(function () { - data.items.push({ - name: $(this).text(), - url: $(this).data('url'), - branch: $(this).hasClass('branch'), - tag: $(this).hasClass('tag'), - selected: $(this).hasClass('selected') - }); - }); - $data.remove(); - // eslint-disable-next-line unicorn/no-this-assignment - const elRoot = this; + if (data.showBranchesInDropdown) { + for (const branch of data.branches) { + data.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === data.defaultBranch}); + } + } + if (!data.noTag) { + for (const tag of data.tags) { + data.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === data.release?.tagName}); + } + } + const view = createApp({ delimiters: vueDelimiters, data() { @@ -77,10 +69,7 @@ export function initRepoBranchTagDropdown(selector) { }, beforeMount() { - this.noResults = elRoot.getAttribute('data-no-results'); - this.canCreateBranch = elRoot.getAttribute('data-can-create-branch') === 'true'; - this.branchForm = elRoot.getAttribute('data-branch-form'); - switch (elRoot.getAttribute('data-view-type')) { + switch (data.viewType) { case 'tree': this.isViewTree = true; break; @@ -91,14 +80,6 @@ export function initRepoBranchTagDropdown(selector) { this.isViewBranch = true; break; } - this.refName = elRoot.getAttribute('data-ref-name'); - this.branchURLPrefix = elRoot.getAttribute('data-branch-url-prefix'); - this.branchURLSuffix = elRoot.getAttribute('data-branch-url-suffix'); - this.tagURLPrefix = elRoot.getAttribute('data-tag-url-prefix'); - this.tagURLSuffix = elRoot.getAttribute('data-tag-url-suffix'); - this.setAction = elRoot.getAttribute('data-set-action') === 'true'; - this.submitForm = elRoot.getAttribute('data-submit-form') === 'true'; - document.body.addEventListener('click', (event) => { if (elRoot.contains(event.target)) return; @@ -116,7 +97,7 @@ export function initRepoBranchTagDropdown(selector) { } item.selected = true; const url = (item.tag) ? this.tagURLPrefix + item.url + this.tagURLSuffix : this.branchURLPrefix + item.url + this.branchURLSuffix; - if (this.branchForm === '') { + if (!this.branchForm) { window.location.href = url; } else { this.isViewTree = false; diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 5173a5b59907c..70542ad883e9c 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -485,7 +485,7 @@ export function initRepository() { // File list and commits if ($('.repository.file.list').length > 0 || $('.branch-dropdown').length > 0 || $('.repository.commits').length > 0 || $('.repository.release').length > 0) { - initRepoBranchTagDropdown('.choose.reference .dropdown'); + initRepoBranchTagDropdown('.choose.reference .ui.dropdown'); } // Wiki