Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

changes to support page level scripts, ability to detect prerendering

Browse Source
This commit is contained in:
sbwalker
2023-05-22 13:56:48 -04:00
parent e41d9008b3
commit ded326c822
7 changed files with 131 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Pages/_Host.cshtml
View File

@ -15,8 +15,8 @@
{
<link id="app-manifest" rel="manifest" />
}
@Html.Raw(Model.HeadResources)
<component type="typeof(Oqtane.Head)" render-mode="@((RenderMode)Enum.Parse(typeof(RenderMode), Model.RenderMode, true))" />
@Html.Raw(Model.HeadResources)
</head>
<body>
@if (string.IsNullOrEmpty(Model.Message))

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

@ -19,7 +19,6 @@ using Microsoft.Extensions.Primitives;
using Oqtane.Enums;
using Oqtane.Security;
using Oqtane.Extensions;
using Oqtane.Themes;
namespace Oqtane.Pages
{
@ -130,10 +129,8 @@ namespace Oqtane.Pages
{
PWAScript = CreatePWAScript(alias, site, route);
}
if (!string.IsNullOrEmpty(site.HeadContent))
{
ProcessHeadContent(site.HeadContent, "site");
}
// site level scripts
HeadResources += ParseScripts(site.HeadContent);
// get jwt token for downstream APIs
if (User.Identity.IsAuthenticated)
@ -174,8 +171,6 @@ namespace Oqtane.Pages
}
}
ProcessHeadContent(page.HeadContent, $"page{page.PageId}");
// include global resources
var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
foreach (Assembly assembly in assemblies)
@ -427,27 +422,20 @@ namespace Oqtane.Pages
}
}
private void ProcessHeadContent(string headcontent, string id)
private string ParseScripts(string headcontent)
{
// add scripts to page
// iterate scripts
var scripts = "";
if (!string.IsNullOrEmpty(headcontent))
{
var count = 0;
var index = headcontent.IndexOf("<script");
while (index >= 0)
{
var script = headcontent.Substring(index, headcontent.IndexOf("</script>", index) + 9 - index);
if (!script.Contains("src=") && !script.Contains("id="))
{
count += 1;
id += $"-script{count}";
script = script.Replace("<script", $"<script id=\"{id}\"");
index += id.Length;
}
HeadResources += script + Environment.NewLine;
scripts += headcontent.Substring(index, headcontent.IndexOf("</script>", index) + 9 - index);
index = headcontent.IndexOf("<script", index + 1);
}
}
return scripts;
}
private void ProcessResource(Resource resource, int count, Alias alias)