Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2821 from sbwalker/dev

Browse Source 
handle id attribute automatically for headcontent inline scripts
This commit is contained in:
Shaun Walker 2023-05-18 08:27:07 -04:00 committed by GitHub
commit af27c763e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -134,7 +134,7 @@
</div> </div>
</div> </div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute." ResourceKey="HeadContent">Head Content: </Label> <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea> <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
</div> </div>

2
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -141,7 +141,7 @@
</div> </div>
</div> </div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute." ResourceKey="HeadContent">Head Content: </Label> <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea> <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
</div> </div>

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

@ -105,7 +105,7 @@
</div> </div>
</div> </div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute." ResourceKey="HeadContent">Head Content: </Label> <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea> <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
</div> </div>

2
Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx
View File

@ -229,7 +229,7 @@
<value>Appearance</value> <value>Appearance</value>
</data> </data>
<data name="HeadContent.HelpText" xml:space="preserve"> <data name="HeadContent.HelpText" xml:space="preserve">
<value>Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute.</value> <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags)</value>
</data> </data>
<data name="HeadContent.Text" xml:space="preserve"> <data name="HeadContent.Text" xml:space="preserve">
<value>Head Content:</value> <value>Head Content:</value>

2
Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
View File

@ -265,7 +265,7 @@
<value>Clickable?</value> <value>Clickable?</value>
</data> </data>
<data name="HeadContent.HelpText" xml:space="preserve"> <data name="HeadContent.HelpText" xml:space="preserve">
<value>Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute.</value> <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags)</value>
</data> </data>
<data name="HeadContent.Text" xml:space="preserve"> <data name="HeadContent.Text" xml:space="preserve">
<value>Head Content:</value> <value>Head Content:</value>

2
Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
View File

@ -355,7 +355,7 @@
<value>Appearance</value> <value>Appearance</value>
</data> </data>
<data name="HeadContent.HelpText" xml:space="preserve"> <data name="HeadContent.HelpText" xml:space="preserve">
<value>Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute.</value> <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags)</value>
</data> </data>
<data name="HeadContent.Text" xml:space="preserve"> <data name="HeadContent.Text" xml:space="preserve">
<value>Head Content:</value> <value>Head Content:</value>

6
Oqtane.Client/UI/ThemeBuilder.razor
View File

@ -86,6 +86,7 @@
if (PageState.Page.HeadContent != null && PageState.Page.HeadContent.Contains("<script")) if (PageState.Page.HeadContent != null && PageState.Page.HeadContent.Contains("<script"))
{ {
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
var count = 0;
var index = PageState.Page.HeadContent.IndexOf("<script"); var index = PageState.Page.HeadContent.IndexOf("<script");
while (index >= 0) while (index >= 0)
{ {
@ -128,6 +129,11 @@
} }
else else
{ {
if (id == "")
{
count += 1;
id = $"page{PageState.Page.PageId}-script{count}";
}
index = script.IndexOf(">") + 1; index = script.IndexOf(">") + 1;
await interop.IncludeScript(id, "", "", "", script.Substring(index, script.IndexOf("</script>") - index), "head"); await interop.IncludeScript(id, "", "", "", script.Substring(index, script.IndexOf("</script>") - index), "head");
} }

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

@ -127,7 +127,7 @@ namespace Oqtane.Pages
} }
if (!string.IsNullOrEmpty(site.HeadContent)) if (!string.IsNullOrEmpty(site.HeadContent))
{ {
ProcessHeadContent(site.HeadContent); ProcessHeadContent(site.HeadContent, "site");
} }
var ThemeType = site.DefaultThemeType; var ThemeType = site.DefaultThemeType;
@ -170,7 +170,7 @@ namespace Oqtane.Pages
} }
} }
ProcessHeadContent(page.HeadContent); ProcessHeadContent(page.HeadContent, $"page{page.PageId}");
// include global resources // include global resources
var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies(); var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
@ -382,15 +382,24 @@ namespace Oqtane.Pages
} }
} }
private void ProcessHeadContent(string headcontent) private void ProcessHeadContent(string headcontent, string id)
{ {
// iterate scripts // iterate scripts
if (headcontent != null) if (headcontent != null)
{ {
var count = 0;
var index = headcontent.IndexOf("<script"); var index = headcontent.IndexOf("<script");
while (index >= 0) while (index >= 0)
{ {
HeadResources += headcontent.Substring(index, headcontent.IndexOf("</script>", index) + 9 - index) + Environment.NewLine; 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;
index = headcontent.IndexOf("<script", index + 1); index = headcontent.IndexOf("<script", index + 1);
} }
} }