59d060622d
Follow #22719 ### Major changes 1. `ServerError` doesn't do format, so remove the `%s` 2. Simplify `RenderBranchFeed` (slightly) 3. Remove unused `BranchFeedRSS` 4. Make `feed.RenderBranchFeed` respect `EnableFeed` config 5. Make `RepoBranchTagSelector.vue` respect `EnableFeed` setting, otherwise there is always RSS icon 6. The `(branchURLPrefix + item.url).replace('src', 'rss')` doesn't seem right for all cases, for example, the string `src` could appear in `branchURLPrefix`, so we need a separate `rssURLPrefix` 7. The `<a>` in Vue menu needs `@click.stop`, otherwise the menu itself would be triggered at the same time 8. Change `<a><button></button></a>` to `<a role=button>` 9. Use `{{PathEscapeSegments .TreePath}}` instead of `{{range $i, $v := .TreeNames}}/{{$v}}{{end}}` Screenshot of changed parts: <details>    </details> ### Other thoughts Should we remove the RSS icon from the branch dropdown list? It seems too complex for a list UI, and users already have the chance to get the RSS feed URL from "branches" page. --------- Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: silverwind <me@silverwind.io>
85 lines
4.0 KiB
Handlebars
85 lines
4.0 KiB
Handlebars
{{$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}}
|
|
|
|
<script type="module">
|
|
const data = {
|
|
'textReleaseCompare': {{.root.locale.Tr "repo.release.compare"}},
|
|
'textCreateTag': {{.root.locale.Tr "repo.tag.create_tag"}},
|
|
'textCreateBranch': {{.root.locale.Tr "repo.branch.create_branch"}},
|
|
'textCreateBranchFrom': {{.root.locale.Tr "repo.branch.create_from"}},
|
|
'textBranches': {{.root.locale.Tr "repo.branches"}},
|
|
'textTags': {{.root.locale.Tr "repo.tags"}},
|
|
|
|
'mode': '{{if or .root.IsViewTag .isTag}}tags{{else}}branches{{end}}',
|
|
'showBranchesInDropdown': {{$showBranchesInDropdown}},
|
|
'searchFieldPlaceholder': '{{if $.noTag}}{{.root.locale.Tr "repo.pulls.filter_branch"}}{{else if $showBranchesInDropdown}}{{.root.locale.Tr "repo.filter_branch_and_tag"}}{{else}}{{.root.locale.Tr "repo.find_tag"}}{{end}}...',
|
|
'branchForm': {{$.branchForm}},
|
|
'disableCreateBranch': {{if .disableCreateBranch}}{{.disableCreateBranch}}{{else}}{{not .root.CanCreateBranch}}{{end}},
|
|
'setAction': {{.setAction}},
|
|
'submitForm': {{.submitForm}},
|
|
'viewType': {{$type}},
|
|
'refName': {{if and .root.IsViewTag (not .noTag)}}{{.root.TagName}}{{else if .root.IsViewBranch}}{{.root.BranchName}}{{else}}{{ShortSha .root.CommitID}}{{end}},
|
|
'commitIdShort': {{ShortSha .root.CommitID}},
|
|
'tagName': {{.root.TagName}},
|
|
'branchName': {{.root.BranchName}},
|
|
'noTag': {{.noTag}},
|
|
'branches': {{.root.Branches}},
|
|
'tags': {{.root.Tags}},
|
|
'defaultBranch': {{$defaultBranch}},
|
|
'enableFeed': {{.root.EnableFeed}},
|
|
'rssURLPrefix': '{{$.root.RepoLink}}/rss/branch/',
|
|
'branchURLPrefix': '{{if .branchURLPrefix}}{{.branchURLPrefix}}{{else}}{{$.root.RepoLink}}/{{if $.root.PageIsCommits}}commits{{else}}src{{end}}/branch/{{end}}',
|
|
'branchURLSuffix': '{{if .branchURLSuffix}}{{.branchURLSuffix}}{{else}}{{if $.root.TreePath}}/{{PathEscapeSegments $.root.TreePath}}{{end}}{{end}}',
|
|
'tagURLPrefix': '{{if .tagURLPrefix}}{{.tagURLPrefix}}{{else if .release}}{{$.root.RepoLink}}/compare/{{else}}{{$.root.RepoLink}}/{{if $.root.PageIsCommits}}commits{{else}}src{{end}}/tag/{{end}}',
|
|
'tagURLSuffix': '{{if .tagURLSuffix}}{{.tagURLSuffix}}{{else if .release}}...{{if .release.IsDraft}}{{PathEscapeSegments .release.Target}}{{else}}{{if .release.TagName}}{{PathEscapeSegments .release.TagName}}{{else}}{{PathEscapeSegments .release.Sha1}}{{end}}{{end}}{{else}}{{if $.root.TreePath}}/{{PathEscapeSegments $.root.TreePath}}{{end}}{{end}}',
|
|
'repoLink': {{.root.RepoLink}},
|
|
'treePath': {{.root.TreePath}},
|
|
'branchNameSubURL': {{.root.BranchNameSubURL}},
|
|
'noResults': {{.root.locale.Tr "repo.pulls.no_results"}},
|
|
};
|
|
{{if .release}}
|
|
data.release = {
|
|
'tagName': {{.release.TagName}},
|
|
};
|
|
{{end}}
|
|
window.config.pageData.branchDropdownDataList = window.config.pageData.branchDropdownDataList || [];
|
|
window.config.pageData.branchDropdownDataList.push(data);
|
|
</script>
|
|
|
|
<div class="fitted item js-branch-tag-selector">
|
|
{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
|
|
<div class="ui floating filter dropdown custom">
|
|
<button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df">
|
|
<span class="text gt-df gt-ac gt-mr-2">
|
|
{{if .release}}
|
|
{{.root.locale.Tr "repo.release.compare"}}
|
|
{{else}}
|
|
{{if eq $type "tag"}}
|
|
{{svg "octicon-tag"}}
|
|
{{else}}
|
|
{{svg "octicon-git-branch"}}
|
|
{{end}}
|
|
<strong ref="dropdownRefName" class="gt-ml-3">{{if and .root.IsViewTag (not .noTag)}}{{.root.TagName}}{{else if .root.IsViewBranch}}{{.root.BranchName}}{{else}}{{ShortSha .root.CommitID}}{{end}}</strong>
|
|
{{end}}
|
|
</span>
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
</button>
|
|
</div>
|
|
</div>
|