kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1898 from sbwalker/dev

Browse Source 
separate PWA service worker script from manifest script
This commit is contained in:
Shaun Walker 2021-12-23 09:36:43 -05:00 committed by GitHub
commit 037db8a3e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -424,7 +424,6 @@
{ {
site.Runtime = _runtime; site.Runtime = _runtime;
site.RenderMode = _runtime + _prerender; site.RenderMode = _runtime + _prerender;
refresh = true;
reload = true; // needs to be reloaded on server reload = true; // needs to be reloaded on server
} }
} }
@ -525,7 +524,7 @@
await logger.LogInformation("Site Settings Saved {Site}", site); await logger.LogInformation("Site Settings Saved {Site}", site);
if (refresh) if (refresh || reload)
{ {
NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
} }

4
Oqtane.Server/Pages/_Host.cshtml.cs
View File

@ -258,7 +258,7 @@ namespace Oqtane.Pages
private string CreatePWAScript(Alias alias, Site site, Route route) private string CreatePWAScript(Alias alias, Site site, Route route)
{ {
return return
"<script>" + "<script id=\"app-pwa\">" +
"setTimeout(() => { " + "setTimeout(() => { " +
"var manifest = { " + "var manifest = { " +
"\"name\": \"" + site.Name + "\", " + "\"name\": \"" + site.Name + "\", " +
@ -283,6 +283,8 @@ namespace Oqtane.Pages
"document.getElementById('app-manifest').setAttribute('href', url); " + "document.getElementById('app-manifest').setAttribute('href', url); " +
"} " + "} " +
", 1000);" + ", 1000);" +
"</script>" + Environment.NewLine +
"<script id=\"app-serviceworker\">" +
"if ('serviceWorker' in navigator) { " + "if ('serviceWorker' in navigator) { " +
"navigator.serviceWorker.register('/service-worker.js').then(function(registration) { " + "navigator.serviceWorker.register('/service-worker.js').then(function(registration) { " +
"console.log('ServiceWorker Registration Successful'); " + "console.log('ServiceWorker Registration Successful'); " +