diff options
author | silverwind <me@silverwind.io> | 2021-05-08 16:27:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-08 16:27:25 +0200 |
commit | 24ad131221d8cb0becf726e0570f53838262edf1 (patch) | |
tree | a06648e4fd6b051eaca60513b63ba3fe69314cd1 /web_src | |
parent | e2786147539909eaef2bc39fb728a10b88277d31 (diff) | |
download | gitea-24ad131221d8cb0becf726e0570f53838262edf1.tar.gz gitea-24ad131221d8cb0becf726e0570f53838262edf1.zip |
Rename StaticUrlPrefix to AssetUrlPrefix (#15779)
Use a new name for this template/frontend variable to make it distinct
from the server variable StaticURLPrefix.
Diffstat (limited to 'web_src')
-rw-r--r-- | web_src/js/features/emoji.js | 4 | ||||
-rw-r--r-- | web_src/js/features/serviceworker.js | 2 | ||||
-rw-r--r-- | web_src/js/index.js | 4 | ||||
-rw-r--r-- | web_src/js/publicpath.js | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/web_src/js/features/emoji.js b/web_src/js/features/emoji.js index 0da61c4d56..7a522b95fc 100644 --- a/web_src/js/features/emoji.js +++ b/web_src/js/features/emoji.js @@ -1,6 +1,6 @@ import emojis from '../../../assets/emoji.json'; -const {StaticUrlPrefix} = window.config; +const {AssetUrlPrefix} = window.config; const tempMap = {gitea: ':gitea:'}; for (const {emoji, aliases} of emojis) { @@ -24,7 +24,7 @@ for (const key of emojiKeys) { export function emojiHTML(name) { let inner; if (name === 'gitea') { - inner = `<img alt=":${name}:" src="${StaticUrlPrefix}/img/emoji/gitea.png">`; + inner = `<img alt=":${name}:" src="${AssetUrlPrefix}/img/emoji/gitea.png">`; } else { inner = emojiString(name); } diff --git a/web_src/js/features/serviceworker.js b/web_src/js/features/serviceworker.js index 400a33140b..57b2c399f6 100644 --- a/web_src/js/features/serviceworker.js +++ b/web_src/js/features/serviceworker.js @@ -31,7 +31,7 @@ export default async function initServiceWorker() { if (UseServiceWorker) { try { - // normally we'd serve the service worker as a static asset from StaticUrlPrefix but + // normally we'd serve the service worker as a static asset from AssetUrlPrefix but // the spec strictly requires it to be same-origin so it has to be AppSubUrl to work await Promise.all([ checkCacheValidity(), diff --git a/web_src/js/index.js b/web_src/js/index.js index 6ffff9cb19..5249b88516 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -25,7 +25,7 @@ import {renderMarkupContent} from './markup/content.js'; import {stripTags, mqBinarySearch} from './utils.js'; import {svg, svgs} from './svg.js'; -const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; +const {AppSubUrl, AssetUrlPrefix, csrf} = window.config; let previewFileModes; const commentMDEditors = {}; @@ -3138,7 +3138,7 @@ function initVueComponents() { finalPage: 1, searchQuery, isLoading: false, - staticPrefix: StaticUrlPrefix, + staticPrefix: AssetUrlPrefix, counts: {}, repoTypes: { all: { diff --git a/web_src/js/publicpath.js b/web_src/js/publicpath.js index 38865aa666..bfc81b8765 100644 --- a/web_src/js/publicpath.js +++ b/web_src/js/publicpath.js @@ -1,9 +1,9 @@ // This sets up the URL prefix used in webpack's chunk loading. // This file must be imported before any lazy-loading is being attempted. -const {StaticUrlPrefix} = window.config; +const {AssetUrlPrefix} = window.config; -if (StaticUrlPrefix) { - __webpack_public_path__ = StaticUrlPrefix.endsWith('/') ? StaticUrlPrefix : `${StaticUrlPrefix}/`; +if (AssetUrlPrefix) { + __webpack_public_path__ = AssetUrlPrefix.endsWith('/') ? AssetUrlPrefix : `${AssetUrlPrefix}/`; } else { const url = new URL(document.currentScript.src); __webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/'); |