Skip to content

Commit 79c91a5

Browse files
65436543
authored
Merge branch 'main' into exponential-backoff-for-bytefifo
2 parents bda7fa3 + 24ad131 commit 79c91a5

21 files changed

+71
-71
lines changed

‎modules/templates/helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func NewFuncMap() []template.FuncMap {
6060
"AppSubUrl": func() string {
6161
return setting.AppSubURL
6262
},
63-
"StaticUrlPrefix": func() string {
63+
"AssetUrlPrefix": func() string {
6464
return setting.StaticURLPrefix + "/assets"
6565
},
6666
"AppUrl": func() string {

‎templates/admin/hook_new.tmpl

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
{{end}}
1616
<div class="ui right">
1717
{{if eq .HookType "gitea"}}
18-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg">
18+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
1919
{{else if eq .HookType "gogs"}}
20-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico">
20+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
2121
{{else if eq .HookType "slack"}}
22-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/slack.png">
22+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
2323
{{else if eq .HookType "discord"}}
24-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/discord.png">
24+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
2525
{{else if eq .HookType "dingtalk"}}
26-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/dingtalk.ico">
26+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
2727
{{else if eq .HookType "telegram"}}
28-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/telegram.png">
28+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
2929
{{else if eq .HookType "msteams"}}
30-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/msteams.png">
30+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
3131
{{else if eq .HookType "feishu"}}
32-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/feishu.png">
32+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
3333
{{else if eq .HookType "matrix"}}
34-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/matrix.svg">
34+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
3535
{{end}}
3636
</div>
3737
</h4>

‎templates/base/footer.tmpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212

1313
{{template "base/footer_content" .}}
1414
{{if .RequireSimpleMDE}}
15-
<script src="{{StaticUrlPrefix}}/js/easymde.js?v={{MD5 AppVer}}"></script>
16-
<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
17-
<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
15+
<script src="{{AssetUrlPrefix}}/js/easymde.js?v={{MD5 AppVer}}"></script>
16+
<script src="{{AssetUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
17+
<script src="{{AssetUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
1818
<script>
19-
CodeMirror.modeURL = '{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/%N/%N.js';
19+
CodeMirror.modeURL = '{{AssetUrlPrefix}}/vendor/plugins/codemirror/mode/%N/%N.js';
2020
</script>
2121
{{end}}
2222

2323
<!-- Third-party libraries -->
2424
{{if .RequireU2F}}
25-
<script src="{{StaticUrlPrefix}}/vendor/plugins/u2f/index.js"></script>
25+
<script src="{{AssetUrlPrefix}}/vendor/plugins/u2f/index.js"></script>
2626
{{end}}
2727
{{if .EnableCaptcha}}
2828
{{if eq .CaptchaType "recaptcha"}}
@@ -32,7 +32,7 @@
3232
<script src='https://hcaptcha.com/1/api.js' async></script>
3333
{{end}}
3434
{{end}}
35-
<script src="{{StaticUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>
35+
<script src="{{AssetUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>
3636
{{template "custom/footer" .}}
3737
</body>
3838
</html>

‎templates/base/footer_content.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{{end}}
1717
</div>
1818
</div>
19-
<a href="{{StaticUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
19+
<a href="{{AssetUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
2020
{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
2121
<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.i18n.Tr "website"}}</a>
2222
{{template "custom/extra_links_footer" .}}

‎templates/base/head.tmpl

+8-8
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
window.config = {
3030
AppVer: '{{AppVer}}',
3131
AppSubUrl: '{{AppSubUrl}}',
32-
StaticUrlPrefix: '{{StaticUrlPrefix}}',
32+
AssetUrlPrefix: '{{AssetUrlPrefix}}',
3333
UseServiceWorker: {{UseServiceWorker}},
3434
csrf: '{{.CsrfToken}}',
3535
HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}},
@@ -61,12 +61,12 @@
6161
{{end}}
6262
};
6363
</script>
64-
<link rel="icon" href="{{StaticUrlPrefix}}/img/logo.svg" type="image/svg+xml">
65-
<link rel="alternate icon" href="{{StaticUrlPrefix}}/img/favicon.png" type="image/png">
64+
<link rel="icon" href="{{AssetUrlPrefix}}/img/logo.svg" type="image/svg+xml">
65+
<link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png" type="image/png">
6666
{{if .RequireSimpleMDE}}
67-
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
67+
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
6868
{{end}}
69-
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
69+
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
7070
<noscript>
7171
<style>
7272
.dropdown:hover > .menu { display: block; }
@@ -105,17 +105,17 @@
105105
{{else}}
106106
<meta property="og:title" content="{{AppName}}">
107107
<meta property="og:type" content="website" />
108-
<meta property="og:image" content="{{StaticUrlPrefix}}/img/logo.png" />
108+
<meta property="og:image" content="{{AssetUrlPrefix}}/img/logo.png" />
109109
<meta property="og:url" content="{{AppUrl}}" />
110110
<meta property="og:description" content="{{MetaDescription}}">
111111
{{end}}
112112
<meta property="og:site_name" content="{{AppName}}" />
113113
{{if .IsSigned }}
114114
{{ if ne .SignedUser.Theme "gitea" }}
115-
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}">
115+
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}">
116116
{{end}}
117117
{{else if ne DefaultTheme "gitea"}}
118-
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}">
118+
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}">
119119
{{end}}
120120
{{template "custom/header" .}}
121121
</head>

‎templates/base/head_navbar.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="ui container" id="navbar">
22
<div class="item brand" style="justify-content: space-between;">
33
<a href="{{AppSubUrl}}/">
4-
<img class="ui mini image" with="30" height="30" src="{{StaticUrlPrefix}}/img/logo.svg">
4+
<img class="ui mini image" with="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg">
55
</a>
66
<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
77
<i class="sidebar icon"></i>

‎templates/home.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="ui stackable middle very relaxed page grid">
44
<div class="sixteen wide center aligned centered column">
55
<div>
6-
<img class="logo" width="220" height="220" src="{{StaticUrlPrefix}}/img/logo.svg"/>
6+
<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg"/>
77
</div>
88
<div class="hero">
99
<h1 class="ui icon header title">

‎templates/install.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,5 +321,5 @@
321321
</div>
322322
</div>
323323
</div>
324-
<img style="display: none" src="{{StaticUrlPrefix}}/img/loading.png"/>
324+
<img style="display: none" src="{{AssetUrlPrefix}}/img/loading.png"/>
325325
{{template "base/footer" .}}

‎templates/org/settings/hook_new.tmpl

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
1111
<div class="ui right">
1212
{{if eq .HookType "gitea"}}
13-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg">
13+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
1414
{{else if eq .HookType "gogs"}}
15-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico">
15+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
1616
{{else if eq .HookType "slack"}}
17-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/slack.png">
17+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
1818
{{else if eq .HookType "discord"}}
19-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/discord.png">
19+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
2020
{{else if eq .HookType "dingtalk"}}
21-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/dingtalk.ico">
21+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
2222
{{else if eq .HookType "telegram"}}
23-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/telegram.png">
23+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
2424
{{else if eq .HookType "msteams"}}
25-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/msteams.png">
25+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
2626
{{else if eq .HookType "feishu"}}
27-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/feishu.png">
27+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
2828
{{else if eq .HookType "matrix"}}
29-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/matrix.svg">
29+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
3030
{{end}}
3131
</div>
3232
</h4>

‎templates/post-install.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="ui stackable middle very relaxed page grid">
88
<div id="repo_migrating" class="sixteen wide center aligned centered column">
99
<div>
10-
<img src="{{StaticUrlPrefix}}/img/loading.png"/>
10+
<img src="{{AssetUrlPrefix}}/img/loading.png"/>
1111
</div>
1212
</div>
1313
</div>

‎templates/repo/migrate/migrating.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<div class="ui stackable middle very relaxed page grid">
1010
<div id="repo_migrating" class="sixteen wide center aligned centered column" task="{{.MigrateTask.ID}}">
1111
<div>
12-
<img src="{{StaticUrlPrefix}}/img/loading.png"/>
12+
<img src="{{AssetUrlPrefix}}/img/loading.png"/>
1313
</div>
1414
</div>
1515
<div id="repo_migrating_failed_image" class="sixteen wide center aligned centered column" style="display: none;">
1616
<div>
17-
<img src="{{StaticUrlPrefix}}/img/failed.png"/>
17+
<img src="{{AssetUrlPrefix}}/img/failed.png"/>
1818
</div>
1919
</div>
2020
</div>

‎templates/repo/settings/webhook/base_list.tmpl

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
<div class="ui blue tiny button">{{.i18n.Tr "repo.settings.add_webhook"}}</div>
66
<div class="menu">
77
<a class="item" href="{{.BaseLinkNew}}/gitea/new">
8-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/gitea.svg">Gitea
8+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gitea.svg">Gitea
99
</a>
1010
<a class="item" href="{{.BaseLinkNew}}/gogs/new">
11-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/gogs.ico">Gogs
11+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gogs.ico">Gogs
1212
</a>
1313
<a class="item" href="{{.BaseLinkNew}}/slack/new">
14-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/slack.png">Slack
14+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/slack.png">Slack
1515
</a>
1616
<a class="item" href="{{.BaseLinkNew}}/discord/new">
17-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/discord.png">Discord
17+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/discord.png">Discord
1818
</a>
1919
<a class="item" href="{{.BaseLinkNew}}/dingtalk/new">
20-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/dingtalk.ico">Dingtalk
20+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/dingtalk.ico">Dingtalk
2121
</a>
2222
<a class="item" href="{{.BaseLinkNew}}/telegram/new">
23-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/telegram.png">Telegram
23+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/telegram.png">Telegram
2424
</a>
2525
<a class="item" href="{{.BaseLinkNew}}/msteams/new">
26-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/msteams.png">Microsoft Teams
26+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/msteams.png">Microsoft Teams
2727
</a>
2828
<a class="item" href="{{.BaseLinkNew}}/feishu/new">
29-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/feishu.png">Feishu
29+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/feishu.png">Feishu
3030
</a>
3131
<a class="item" href="{{.BaseLinkNew}}/matrix/new">
32-
<img width="20" height="20" src="{{StaticUrlPrefix}}/img/matrix.svg">Matrix
32+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/matrix.svg">Matrix
3333
</a>
3434
</div>
3535
</div>

‎templates/repo/settings/webhook/new.tmpl

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
99
<div class="ui right">
1010
{{if eq .HookType "gitea"}}
11-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg">
11+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
1212
{{else if eq .HookType "gogs"}}
13-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico">
13+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
1414
{{else if eq .HookType "slack"}}
15-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/slack.png">
15+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
1616
{{else if eq .HookType "discord"}}
17-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/discord.png">
17+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
1818
{{else if eq .HookType "dingtalk"}}
19-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/dingtalk.ico">
19+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
2020
{{else if eq .HookType "telegram"}}
21-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/telegram.png">
21+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
2222
{{else if eq .HookType "msteams"}}
23-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/msteams.png">
23+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
2424
{{else if eq .HookType "feishu"}}
25-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/feishu.png">
25+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
2626
{{else if eq .HookType "matrix"}}
27-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/matrix.svg">
27+
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
2828
{{end}}
2929
</div>
3030
</h4>

‎templates/repo/view_file.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<strong>{{.i18n.Tr "repo.audio_not_supported_in_browser"}}</strong>
8383
</audio>
8484
{{else if .IsPDFFile}}
85-
<iframe width="100%" height="600px" src="{{StaticUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{EscapePound $.RawFileLink}}"></iframe>
85+
<iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{EscapePound $.RawFileLink}}"></iframe>
8686
{{else}}
8787
<a href="{{EscapePound $.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.i18n.Tr "repo.file_view_raw"}}</a>
8888
{{end}}

‎templates/status/404.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="page-content ui container center full-screen-width {{if .IsRepo}}repository{{end}}">
33
{{if .IsRepo}}{{template "repo/header" .}}{{end}}
44
<div class="ui container center">
5-
<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/404.png" alt="404"/></p>
5+
<p style="margin-top: 100px"><img class="ui centered image" src="{{AssetUrlPrefix}}/img/404.png" alt="404"/></p>
66
<div class="ui divider"></div>
77
<br>
88
<p>{{.i18n.Tr "error404" | Safe}}

‎templates/status/500.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{template "base/head" .}}
22
<div class="page-content ui container full-screen-width center">
3-
<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/500.png" alt="500"/></p>
3+
<p style="margin-top: 100px"><img class="ui centered image" src="{{AssetUrlPrefix}}/img/500.png" alt="500"/></p>
44
<div class="ui divider"></div>
55
<br>
66
{{if .ErrorMsg}}<p>{{.i18n.Tr "error.occurred"}}:</p>

‎templates/swagger/ui.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>Gitea API</title>
6-
<link href="{{StaticUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}" rel="stylesheet">
6+
<link href="{{AssetUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}" rel="stylesheet">
77
</head>
88
<body>
99
<a class="swagger-back-link" href="{{AppUrl}}">{{svg "octicon-reply"}}{{.i18n.Tr "return_to_gitea"}}</a>
1010
<div id="swagger-ui" data-source="{{AppUrl}}swagger.{{.APIJSONVersion}}.json"></div>
11-
<script src="{{StaticUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}"></script>
11+
<script src="{{AssetUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}"></script>
1212
</body>
1313
</html>

‎web_src/js/features/emoji.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import emojis from '../../../assets/emoji.json';
22

3-
const {StaticUrlPrefix} = window.config;
3+
const {AssetUrlPrefix} = window.config;
44

55
const tempMap = {gitea: ':gitea:'};
66
for (const {emoji, aliases} of emojis) {
@@ -24,7 +24,7 @@ for (const key of emojiKeys) {
2424
export function emojiHTML(name) {
2525
let inner;
2626
if (name === 'gitea') {
27-
inner = `<img alt=":${name}:" src="${StaticUrlPrefix}/img/emoji/gitea.png">`;
27+
inner = `<img alt=":${name}:" src="${AssetUrlPrefix}/img/emoji/gitea.png">`;
2828
} else {
2929
inner = emojiString(name);
3030
}

‎web_src/js/features/serviceworker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default async function initServiceWorker() {
3131

3232
if (UseServiceWorker) {
3333
try {
34-
// normally we'd serve the service worker as a static asset from StaticUrlPrefix but
34+
// normally we'd serve the service worker as a static asset from AssetUrlPrefix but
3535
// the spec strictly requires it to be same-origin so it has to be AppSubUrl to work
3636
await Promise.all([
3737
checkCacheValidity(),

‎web_src/js/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {renderMarkupContent} from './markup/content.js';
2525
import {stripTags, mqBinarySearch} from './utils.js';
2626
import {svg, svgs} from './svg.js';
2727

28-
const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
28+
const {AppSubUrl, AssetUrlPrefix, csrf} = window.config;
2929

3030
let previewFileModes;
3131
const commentMDEditors = {};
@@ -3138,7 +3138,7 @@ function initVueComponents() {
31383138
finalPage: 1,
31393139
searchQuery,
31403140
isLoading: false,
3141-
staticPrefix: StaticUrlPrefix,
3141+
staticPrefix: AssetUrlPrefix,
31423142
counts: {},
31433143
repoTypes: {
31443144
all: {

‎web_src/js/publicpath.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// This sets up the URL prefix used in webpack's chunk loading.
22
// This file must be imported before any lazy-loading is being attempted.
3-
const {StaticUrlPrefix} = window.config;
3+
const {AssetUrlPrefix} = window.config;
44

5-
if (StaticUrlPrefix) {
6-
__webpack_public_path__ = StaticUrlPrefix.endsWith('/') ? StaticUrlPrefix : `${StaticUrlPrefix}/`;
5+
if (AssetUrlPrefix) {
6+
__webpack_public_path__ = AssetUrlPrefix.endsWith('/') ? AssetUrlPrefix : `${AssetUrlPrefix}/`;
77
} else {
88
const url = new URL(document.currentScript.src);
99
__webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/');

0 commit comments

Comments
 (0)