diff options
| author | silverwind <me@silverwind.io> | 2023-08-14 04:16:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-14 02:16:40 +0000 |
| commit | 56b6b2b88ef175cc18d2ccdb86c220e885a24262 (patch) | |
| tree | 346acee8a05cbd36217eb42e3b8eac34f0307348 | |
| parent | 7456573541c0c01314690e4a40bc4b5ec6faf79e (diff) | |
| download | gitea-56b6b2b88ef175cc18d2ccdb86c220e885a24262.tar.gz gitea-56b6b2b88ef175cc18d2ccdb86c220e885a24262.zip | |
Fix tooltip of commit select button (#26472)
Previously, the tooltip for this button was only shown after opening and
closing it once because it was only set after the server response, now
it shows before opening it.
| -rw-r--r-- | routers/web/repo/pull.go | 1 | ||||
| -rw-r--r-- | templates/repo/diff/box.tmpl | 2 | ||||
| -rw-r--r-- | web_src/js/components/DiffCommitSelector.vue | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index be4e9711e7..e3854779fe 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -718,7 +718,6 @@ func GetPullCommits(ctx *context.Context) { // Get the needed locale resp.Locale = map[string]string{ "lang": ctx.Locale.Language(), - "filter_changes_by_commit": ctx.Tr("repo.pulls.filter_changes_by_commit"), "show_all_commits": ctx.Tr("repo.pulls.show_all_commits"), "stats_num_commits": ctx.TrN(len(commits), "repo.activity.git_stats_commit_1", "repo.activity.git_stats_commit_n", len(commits)), "show_changes_since_your_last_review": ctx.Tr("repo.pulls.show_changes_since_your_last_review"), diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 324166b03c..7b936cb817 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -32,7 +32,7 @@ {{template "repo/diff/whitespace_dropdown" .}} {{template "repo/diff/options_dropdown" .}} {{if .PageIsPullFiles}} - <div id="diff-commit-select" data-issuelink="{{$.Issue.Link}}" data-queryparams="?style={{if $.IsSplitStyle}}split{{else}}unified{{end}}&whitespace={{$.WhitespaceBehavior}}&show-outdated={{$.ShowOutdatedComments}}"> + <div id="diff-commit-select" data-issuelink="{{$.Issue.Link}}" data-queryparams="?style={{if $.IsSplitStyle}}split{{else}}unified{{end}}&whitespace={{$.WhitespaceBehavior}}&show-outdated={{$.ShowOutdatedComments}}" data-filter_changes_by_commit="{{.locale.Tr "repo.pulls.filter_changes_by_commit"}}"> {{/* the following will be replaced by vue component but this avoids any loading artifacts till the vue component is initialized diff --git a/web_src/js/components/DiffCommitSelector.vue b/web_src/js/components/DiffCommitSelector.vue index a0fc4b2a91..e24619dc08 100644 --- a/web_src/js/components/DiffCommitSelector.vue +++ b/web_src/js/components/DiffCommitSelector.vue @@ -77,10 +77,13 @@ import {SvgIcon} from '../svg.js'; export default { components: {SvgIcon}, data: () => { + const el = document.getElementById('diff-commit-select'); return { menuVisible: false, isLoading: false, - locale: {}, + locale: { + filter_changes_by_commit: el.getAttribute('data-filter_changes_by_commit'), + }, commits: [], hoverActivated: false, lastReviewCommitSha: null |