Skip to content

Commit 17f77f3

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix line number width in code preview (go-gitea#31307) Delete legacy cookie before setting new cookie (go-gitea#31306) [skip ci] Updated translations via Crowdin Use `querySelector` over alternative DOM methods (go-gitea#31280) Remove jQuery `.text()` (go-gitea#30506) [skip ci] Updated translations via Crowdin Remove sub-path from container registry realm (go-gitea#31293) Fix some URLs whose sub-path is missing (go-gitea#31289)
2 parents 77ff67f + 397930d commit 17f77f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+476
-365
lines changed

‎.eslintrc.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ rules:
324324
jquery/no-sizzle: [2]
325325
jquery/no-slide: [2]
326326
jquery/no-submit: [2]
327-
jquery/no-text: [0]
327+
jquery/no-text: [2]
328328
jquery/no-toggle: [2]
329329
jquery/no-trigger: [0]
330330
jquery/no-trim: [2]
@@ -477,7 +477,7 @@ rules:
477477
no-jquery/no-slide: [2]
478478
no-jquery/no-sub: [2]
479479
no-jquery/no-support: [2]
480-
no-jquery/no-text: [0]
480+
no-jquery/no-text: [2]
481481
no-jquery/no-trigger: [0]
482482
no-jquery/no-trim: [2]
483483
no-jquery/no-type: [2]
@@ -798,7 +798,7 @@ rules:
798798
unicorn/prefer-object-has-own: [0]
799799
unicorn/prefer-optional-catch-binding: [2]
800800
unicorn/prefer-prototype-methods: [0]
801-
unicorn/prefer-query-selector: [0]
801+
unicorn/prefer-query-selector: [2]
802802
unicorn/prefer-reflect-apply: [0]
803803
unicorn/prefer-regexp-test: [2]
804804
unicorn/prefer-set-has: [0]

‎modules/setting/packages.go

-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package setting
66
import (
77
"fmt"
88
"math"
9-
"net/url"
109
"os"
1110
"path/filepath"
1211

@@ -19,7 +18,6 @@ var (
1918
Storage *Storage
2019
Enabled bool
2120
ChunkedUploadPath string
22-
RegistryHost string
2321

2422
LimitTotalOwnerCount int64
2523
LimitTotalOwnerSize int64
@@ -66,9 +64,6 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) {
6664
return err
6765
}
6866

69-
appURL, _ := url.Parse(AppURL)
70-
Packages.RegistryHost = appURL.Host
71-
7267
Packages.ChunkedUploadPath = filepath.ToSlash(sec.Key("CHUNKED_UPLOAD_PATH").MustString("tmp/package-upload"))
7368
if !filepath.IsAbs(Packages.ChunkedUploadPath) {
7469
Packages.ChunkedUploadPath = filepath.ToSlash(filepath.Join(AppDataPath, Packages.ChunkedUploadPath))

‎modules/test/utils.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ func IsNormalPageCompleted(s string) bool {
3434
return strings.Contains(s, `<footer class="page-footer"`) && strings.Contains(s, `</html>`)
3535
}
3636

37-
func MockVariableValue[T any](p *T, v T) (reset func()) {
37+
func MockVariableValue[T any](p *T, v ...T) (reset func()) {
3838
old := *p
39-
*p = v
39+
if len(v) > 0 {
40+
*p = v[0]
41+
}
4042
return func() { *p = old }
4143
}

‎modules/web/middleware/cookie.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ func GetSiteCookie(req *http.Request, name string) string {
3535

3636
// SetSiteCookie returns given cookie value from request header.
3737
func SetSiteCookie(resp http.ResponseWriter, name, value string, maxAge int) {
38+
// Previous versions would use a cookie path with a trailing /.
39+
// These are more specific than cookies without a trailing /, so
40+
// we need to delete these if they exist.
41+
deleteLegacySiteCookie(resp, name)
3842
cookie := &http.Cookie{
3943
Name: name,
4044
Value: url.QueryEscape(value),
@@ -46,10 +50,6 @@ func SetSiteCookie(resp http.ResponseWriter, name, value string, maxAge int) {
4650
SameSite: setting.SessionConfig.SameSite,
4751
}
4852
resp.Header().Add("Set-Cookie", cookie.String())
49-
// Previous versions would use a cookie path with a trailing /.
50-
// These are more specific than cookies without a trailing /, so
51-
// we need to delete these if they exist.
52-
deleteLegacySiteCookie(resp, name)
5353
}
5454

5555
// deleteLegacySiteCookie deletes the cookie with the given name at the cookie

‎options/locale/locale_fr-FR.ini

+116-6
Large diffs are not rendered by default.

‎options/locale/locale_ja-JP.ini

+5
Original file line numberDiff line numberDiff line change
@@ -1378,6 +1378,7 @@ commitstatus.success=成功
13781378
ext_issues=外部イシューへのアクセス
13791379
ext_issues.desc=外部のイシュートラッカーへのリンク。
13801380

1381+
projects.desc=プロジェクトでイシューとプルリクエストを管理します。
13811382
projects.description=説明 (オプション)
13821383
projects.description_placeholder=説明
13831384
projects.create=プロジェクトを作成
@@ -1552,7 +1553,9 @@ issues.no_content=説明はありません。
15521553
issues.close=イシューをクローズ
15531554
issues.comment_pull_merged_at=がコミット %[1]s を %[2]s にマージ %[3]s
15541555
issues.comment_manually_pull_merged_at=がコミット %[1]s を %[2]s に手動マージ %[3]s
1556+
issues.close_comment_issue=コメントしてクローズ
15551557
issues.reopen_issue=再オープンする
1558+
issues.reopen_comment_issue=コメントして再オープン
15561559
issues.create_comment=コメントする
15571560
issues.comment.blocked_user=投稿者またはリポジトリのオーナーがあなたをブロックしているため、コメントの作成や編集はできません。
15581561
issues.closed_at=`がイシューをクローズ <a id="%[1]s" href="#%[1]s">%[2]s</a>`
@@ -3412,6 +3415,7 @@ error.unit_not_allowed=このセクションへのアクセスが許可されて
34123415
title=パッケージ
34133416
desc=リポジトリ パッケージを管理します。
34143417
empty=パッケージはまだありません。
3418+
no_metadata=メタデータがありません。
34153419
empty.documentation=パッケージレジストリの詳細については、 <a target="_blank" rel="noopener noreferrer" href="%s">ドキュメント</a> を参照してください。
34163420
empty.repo=パッケージはアップロード済みで、ここに表示されていないですか？ <a href="%[1]s">パッケージ設定</a>を開いて、パッケージをこのリポジトリにリンクしてください。
34173421
registry.documentation=%sレジストリの詳細については、 <a target="_blank" rel="noopener noreferrer" href="%s">ドキュメント</a> を参照してください。
@@ -3634,6 +3638,7 @@ runs.pushed_by=pushed by
36343638
runs.invalid_workflow_helper=ワークフロー設定ファイルは無効です。あなたの設定ファイルを確認してください: %s
36353639
runs.no_matching_online_runner_helper=ラベルに一致するオンラインのランナーが見つかりません: %s
36363640
runs.no_job_without_needs=ワークフローには依存関係のないジョブが少なくとも1つ含まれている必要があります。
3641+
runs.no_job=ワークフローには少なくとも1つのジョブが含まれている必要があります
36373642
runs.actor=アクター
36383643
runs.status=ステータス
36393644
runs.actors_no_select=すべてのアクター

‎routers/api/packages/container/container.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ func apiErrorDefined(ctx *context.Context, err *namedError) {
116116
}
117117

118118
func apiUnauthorizedError(ctx *context.Context) {
119-
// TODO: it doesn't seem quite right but it doesn't really cause problem at the moment.
120-
// container registry requires that the "/v2" must be in the root, so the sub-path in AppURL should be removed, ideally.
121-
ctx.Resp.Header().Add("WWW-Authenticate", `Bearer realm="`+httplib.GuessCurrentAppURL(ctx)+`v2/token",service="container_registry",scope="*"`)
119+
// container registry requires that the "/v2" must be in the root, so the sub-path in AppURL should be removed
120+
realmURL := strings.TrimSuffix(httplib.GuessCurrentAppURL(ctx), setting.AppSubURL+"/") + "/v2/token"
121+
ctx.Resp.Header().Add("WWW-Authenticate", `Bearer realm="`+realmURL+`",service="container_registry",scope="*"`)
122122
apiErrorDefined(ctx, errUnauthorized)
123123
}
124124

‎routers/web/user/package.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package user
55

66
import (
77
"net/http"
8+
"net/url"
89

910
"code.gitea.io/gitea/models/db"
1011
org_model "code.gitea.io/gitea/models/organization"
@@ -15,6 +16,7 @@ import (
1516
repo_model "code.gitea.io/gitea/models/repo"
1617
"code.gitea.io/gitea/modules/base"
1718
"code.gitea.io/gitea/modules/container"
19+
"code.gitea.io/gitea/modules/httplib"
1820
"code.gitea.io/gitea/modules/log"
1921
"code.gitea.io/gitea/modules/optional"
2022
alpine_module "code.gitea.io/gitea/modules/packages/alpine"
@@ -178,7 +180,11 @@ func ViewPackageVersion(ctx *context.Context) {
178180

179181
switch pd.Package.Type {
180182
case packages_model.TypeContainer:
181-
ctx.Data["RegistryHost"] = setting.Packages.RegistryHost
183+
registryAppURL, err := url.Parse(httplib.GuessCurrentAppURL(ctx))
184+
if err != nil {
185+
registryAppURL, _ = url.Parse(setting.AppURL)
186+
}
187+
ctx.Data["RegistryHost"] = registryAppURL.Host
182188
case packages_model.TypeAlpine:
183189
branches := make(container.Set[string])
184190
repositories := make(container.Set[string])

‎templates/admin/packages/list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{ctx.Locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
66
{{ctx.Locale.Tr "admin.packages.unreferenced_size" (FileSize .TotalUnreferencedBlobSize)}})
77
<div class="ui right">
8-
<form method="post" action="/admin/packages/cleanup">
8+
<form method="post" action="{{AppSubUrl}}/admin/packages/cleanup">
99
{{.CsrfTokenHtml}}
1010
<button class="ui primary tiny button">{{ctx.Locale.Tr "admin.packages.cleanup"}}</button>
1111
</form>

‎templates/devtest/fetch-action.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div><label><input name="check" type="checkbox"> check</label></div>
2626
<div><button name="btn">submit post</button></div>
2727
</form>
28-
<form method="post" action="/no-such-uri" class="form-fetch-action">
28+
<form method="post" action="no-such-uri" class="form-fetch-action">
2929
<div class="tw-py-8">bad action url</div>
3030
<div><button name="btn">submit test</button></div>
3131
</form>

‎templates/repo/editor/commit_form.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="quick-pull-choice js-quick-pull-choice">
2424
<div class="field">
2525
<div class="ui radio checkbox {{if not .CanCommitToBranch.CanCommitToBranch}}disabled{{end}}">
26-
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" button_text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}>
26+
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" data-button-text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}>
2727
<label>
2828
{{svg "octicon-git-commit"}}
2929
{{ctx.Locale.Tr "repo.editor.commit_directly_to_this_branch" .BranchName}}
@@ -43,9 +43,9 @@
4343
<div class="field">
4444
<div class="ui radio checkbox">
4545
{{if .CanCreatePullRequest}}
46-
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{ctx.Locale.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
46+
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" data-button-text="{{ctx.Locale.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
4747
{{else}}
48-
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
48+
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" data-button-text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
4949
{{end}}
5050
<label>
5151
{{svg "octicon-git-pull-request"}}

‎templates/repo/settings/collaboration.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
<div class="flex-item-trailing">
2020
<div class="flex-text-block">
2121
{{svg "octicon-shield-lock"}}
22-
<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
22+
<div class="ui dropdown custom access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{.Collaboration.Mode}}">
2323
<div class="text">{{if eq .Collaboration.Mode 1}}{{ctx.Locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{ctx.Locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{ctx.Locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
2424
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2525
<div class="menu">
26-
<div class="item" data-text="{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}</div>
27-
<div class="item" data-text="{{ctx.Locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{ctx.Locale.Tr "repo.settings.collaboration.write"}}</div>
28-
<div class="item" data-text="{{ctx.Locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{ctx.Locale.Tr "repo.settings.collaboration.read"}}</div>
26+
<div class="item" data-value="3">{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}</div>
27+
<div class="item" data-value="2">{{ctx.Locale.Tr "repo.settings.collaboration.write"}}</div>
28+
<div class="item" data-value="1">{{ctx.Locale.Tr "repo.settings.collaboration.read"}}</div>
2929
</div>
3030
</div>
3131
</div>

‎templates/user/settings/applications.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
{{ctx.Locale.Tr "settings.select_permissions"}}
7676
</summary>
7777
<p class="activity meta">
78-
<i>{{ctx.Locale.Tr "settings.access_token_desc" (`href="/api/swagger" target="_blank"`|SafeHTML) (`href="https://docs.gitea.com/development/oauth2-provider#scopes" target="_blank"`|SafeHTML)}}</i>
78+
<i>{{ctx.Locale.Tr "settings.access_token_desc" (HTMLFormat `href="%s/api/swagger" target="_blank"` AppSubUrl) (`href="https://docs.gitea.com/development/oauth2-provider#scopes" target="_blank"`|SafeHTML)}}</i>
7979
</p>
8080
<div class="scoped-access-token-mount">
8181
<scoped-access-token-selector

‎tests/integration/api_packages_container_test.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ func TestPackageContainer(t *testing.T) {
8484
Token string `json:"token"`
8585
}
8686

87-
authenticate := []string{`Bearer realm="` + setting.AppURL + `v2/token",service="container_registry",scope="*"`}
87+
defaultAuthenticateValues := []string{`Bearer realm="` + setting.AppURL + `v2/token",service="container_registry",scope="*"`}
8888

8989
t.Run("Anonymous", func(t *testing.T) {
9090
defer tests.PrintCurrentTest(t)()
9191

9292
req := NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL))
9393
resp := MakeRequest(t, req, http.StatusUnauthorized)
9494

95-
assert.ElementsMatch(t, authenticate, resp.Header().Values("WWW-Authenticate"))
95+
assert.ElementsMatch(t, defaultAuthenticateValues, resp.Header().Values("WWW-Authenticate"))
9696

9797
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL))
9898
resp = MakeRequest(t, req, http.StatusOK)
@@ -115,6 +115,12 @@ func TestPackageContainer(t *testing.T) {
115115

116116
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL))
117117
MakeRequest(t, req, http.StatusUnauthorized)
118+
119+
defer test.MockVariableValue(&setting.AppURL, "https://domain:8443/sub-path/")()
120+
defer test.MockVariableValue(&setting.AppSubURL, "/sub-path")()
121+
req = NewRequest(t, "GET", "/v2")
122+
resp = MakeRequest(t, req, http.StatusUnauthorized)
123+
assert.Equal(t, `Bearer realm="https://domain:8443/v2/token",service="container_registry",scope="*"`, resp.Header().Get("WWW-Authenticate"))
118124
})
119125

120126
t.Run("User", func(t *testing.T) {
@@ -123,7 +129,7 @@ func TestPackageContainer(t *testing.T) {
123129
req := NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL))
124130
resp := MakeRequest(t, req, http.StatusUnauthorized)
125131

126-
assert.ElementsMatch(t, authenticate, resp.Header().Values("WWW-Authenticate"))
132+
assert.ElementsMatch(t, defaultAuthenticateValues, resp.Header().Values("WWW-Authenticate"))
127133

128134
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL)).
129135
AddBasicAuth(user.Name)

‎web_src/css/base.css

-2
Original file line numberDiff line numberDiff line change
@@ -1001,8 +1001,6 @@ overflow-menu .ui.label {
10011001
padding: 0 8px;
10021002
text-align: right !important;
10031003
color: var(--color-text-light-2);
1004-
width: 1%;
1005-
font-family: var(--fonts-monospace);
10061004
}
10071005

10081006
.lines-num span.bottom-line::after {

‎web_src/js/components/DashboardRepoList.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const sfc = {
101101
},
102102
103103
mounted() {
104-
const el = document.getElementById('dashboard-repo-list');
104+
const el = document.querySelector('#dashboard-repo-list');
105105
this.changeReposFilter(this.reposFilter);
106106
$(el).find('.dropdown').dropdown();
107107
nextTick(() => {
@@ -330,7 +330,7 @@ const sfc = {
330330
};
331331
332332
export function initDashboardRepoList() {
333-
const el = document.getElementById('dashboard-repo-list');
333+
const el = document.querySelector('#dashboard-repo-list');
334334
if (el) {
335335
createApp(sfc).mount(el);
336336
}

‎web_src/js/components/DiffCommitSelector.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {GET} from '../modules/fetch.js';
55
export default {
66
components: {SvgIcon},
77
data: () => {
8-
const el = document.getElementById('diff-commit-select');
8+
const el = document.querySelector('#diff-commit-select');
99
return {
1010
menuVisible: false,
1111
isLoading: false,

‎web_src/js/components/DiffFileList.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ export default {
77
return {store: diffTreeStore()};
88
},
99
mounted() {
10-
document.getElementById('show-file-list-btn').addEventListener('click', this.toggleFileList);
10+
document.querySelector('#show-file-list-btn').addEventListener('click', this.toggleFileList);
1111
},
1212
unmounted() {
13-
document.getElementById('show-file-list-btn').removeEventListener('click', this.toggleFileList);
13+
document.querySelector('#show-file-list-btn').removeEventListener('click', this.toggleFileList);
1414
},
1515
methods: {
1616
toggleFileList() {

‎web_src/js/components/DiffFileTree.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export default {
112112
updateState(visible) {
113113
const btn = document.querySelector('.diff-toggle-file-tree-button');
114114
const [toShow, toHide] = btn.querySelectorAll('.icon');
115-
const tree = document.getElementById('diff-file-tree');
115+
const tree = document.querySelector('#diff-file-tree');
116116
const newTooltip = btn.getAttribute(visible ? 'data-hide-text' : 'data-show-text');
117117
btn.setAttribute('data-tooltip-content', newTooltip);
118118
toggleElem(tree, visible);

‎web_src/js/components/RepoActionView.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ const sfc = {
325325
export default sfc;
326326
327327
export function initRepositoryActionView() {
328-
const el = document.getElementById('repo-action-view');
328+
const el = document.querySelector('#repo-action-view');
329329
if (!el) return;
330330
331331
// TODO: the parent element's full height doesn't work well now,

‎web_src/js/components/RepoActivityTopAuthors.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const sfc = {
5151
};
5252
5353
export function initRepoActivityTopAuthorsChart() {
54-
const el = document.getElementById('repo-activity-top-authors-chart');
54+
const el = document.querySelector('#repo-activity-top-authors-chart');
5555
if (el) {
5656
createApp(sfc).mount(el);
5757
}

‎web_src/js/components/RepoBranchTagSelector.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const sfc = {
8585
this.isViewBranch = false;
8686
this.$refs.dropdownRefName.textContent = item.name;
8787
if (this.setAction) {
88-
document.getElementById(this.branchForm)?.setAttribute('action', url);
88+
document.querySelector(`#${this.branchForm}`)?.setAttribute('action', url);
8989
} else {
9090
$(`#${this.branchForm} input[name="refURL"]`).val(url);
9191
}

‎web_src/js/components/ScopedAccessTokenSelector.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,25 @@ const sfc = {
4343
},
4444
4545
mounted() {
46-
document.getElementById('scoped-access-submit').addEventListener('click', this.onClickSubmit);
46+
document.querySelector('#scoped-access-submit').addEventListener('click', this.onClickSubmit);
4747
},
4848
4949
unmounted() {
50-
document.getElementById('scoped-access-submit').removeEventListener('click', this.onClickSubmit);
50+
document.querySelector('#scoped-access-submit').removeEventListener('click', this.onClickSubmit);
5151
},
5252
5353
methods: {
5454
onClickSubmit(e) {
5555
e.preventDefault();
5656
57-
const warningEl = document.getElementById('scoped-access-warning');
57+
const warningEl = document.querySelector('#scoped-access-warning');
5858
// check that at least one scope has been selected
59-
for (const el of document.getElementsByClassName('access-token-select')) {
59+
for (const el of document.querySelectorAll('.access-token-select')) {
6060
if (el.value) {
6161
// Hide the error if it was visible from previous attempt.
6262
hideElem(warningEl);
6363
// Submit the form.
64-
document.getElementById('scoped-access-form').submit();
64+
document.querySelector('#scoped-access-form').submit();
6565
// Don't show the warning.
6666
return;
6767
}
@@ -78,7 +78,7 @@ export default sfc;
7878
* Initialize category toggle sections
7979
*/
8080
export function initScopedAccessTokenCategories() {
81-
for (const el of document.getElementsByClassName('scoped-access-token-mount')) {
81+
for (const el of document.querySelectorAll('.scoped-access-token-mount')) {
8282
createApp({})
8383
.component('scoped-access-token-selector', sfc)
8484
.mount(el);

0 commit comments

Comments
 (0)