Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove useless appVer from JS window.config (#21445)

Browse source 
The only usage of `appVer` was in serviceworker.js, while indeed it
needs the asset version.
This commit is contained in:
wxiaoguang 2022-10-14 01:16:27 +08:00 committed by GitHub
parent 0e58201d1a
commit f40833d1f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
templates/base/head_script.tmpl
View file

@ -6,7 +6,6 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
<script> <script>
window.addEventListener('error', function(e) {window._globalHandlerErrors=window._globalHandlerErrors||[]; window._globalHandlerErrors.push(e);}); window.addEventListener('error', function(e) {window._globalHandlerErrors=window._globalHandlerErrors||[]; window._globalHandlerErrors.push(e);});
window.config = { window.config = {
appVer: '{{AppVer}}',
appUrl: '{{AppUrl}}', appUrl: '{{AppUrl}}',
appSubUrl: '{{AppSubUrl}}', appSubUrl: '{{AppSubUrl}}',
assetVersionEncoded: encodeURIComponent('{{AssetVersion}}'), // will be used in URL construction directly assetVersionEncoded: encodeURIComponent('{{AssetVersion}}'), // will be used in URL construction directly

4
web_src/js/features/serviceworker.js
View file

@ -1,6 +1,6 @@
import {joinPaths, parseUrl} from '../utils.js'; import {joinPaths, parseUrl} from '../utils.js';
const {useServiceWorker, assetUrlPrefix, appVer, assetVersionEncoded} = window.config; const {useServiceWorker, assetUrlPrefix, assetVersionEncoded} = window.config;
const cachePrefix = 'static-cache-v'; // actual version is set in the service worker script const cachePrefix = 'static-cache-v'; // actual version is set in the service worker script
const workerUrl = `${joinPaths(assetUrlPrefix, 'serviceworker.js')}?v=${assetVersionEncoded}`; const workerUrl = `${joinPaths(assetUrlPrefix, 'serviceworker.js')}?v=${assetVersionEncoded}`;
@ -25,7 +25,7 @@ async function invalidateCache() {
} }
async function checkCacheValidity() { async function checkCacheValidity() {
const cacheKey = appVer; const cacheKey = assetVersionEncoded;
const storedCacheKey = localStorage.getItem('staticCacheKey'); const storedCacheKey = localStorage.getItem('staticCacheKey');
// invalidate cache if it belongs to a different gitea version // invalidate cache if it belongs to a different gitea version