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

Merge pull request #2831 from sbwalker/dev

Browse Source 
utilize ResourceLocation consistently
This commit is contained in:
Shaun Walker 2023-05-23 08:08:31 -04:00 committed by GitHub
commit b1c0a865a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/ModuleBase.cs
View File

@ -80,7 +80,7 @@ namespace Oqtane.Modules
if (!string.IsNullOrEmpty(resource.Url)) if (!string.IsNullOrEmpty(resource.Url))
{ {
var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url; var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module }); scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module, location = resource.Location.ToString().ToLower() });
} }
else else
{ {

2
Oqtane.Client/Themes/ThemeBase.cs
View File

@ -40,7 +40,7 @@ namespace Oqtane.Themes
if (!string.IsNullOrEmpty(resource.Url)) if (!string.IsNullOrEmpty(resource.Url))
{ {
var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url; var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module }); scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module, location = resource.Location.ToString().ToLower() });
} }
else else
{ {

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

@ -74,16 +74,16 @@
{ {
if (!string.IsNullOrEmpty(PageState.Page.HeadContent) && PageState.Page.HeadContent.Contains("<script")) if (!string.IsNullOrEmpty(PageState.Page.HeadContent) && PageState.Page.HeadContent.Contains("<script"))
{ {
await InjectScripts(PageState.Page.HeadContent, "head"); await InjectScripts(PageState.Page.HeadContent, ResourceLocation.Head);
} }
if (!string.IsNullOrEmpty(PageState.Page.BodyContent) && PageState.Page.BodyContent.Contains("<script")) if (!string.IsNullOrEmpty(PageState.Page.BodyContent) && PageState.Page.BodyContent.Contains("<script"))
{ {
await InjectScripts(PageState.Page.BodyContent, "body"); await InjectScripts(PageState.Page.BodyContent, ResourceLocation.Body);
} }
} }
} }
private async Task InjectScripts(string content, string location) private async Task InjectScripts(string content, ResourceLocation location)
{ {
// inject scripts into page dynamically // inject scripts into page dynamically
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
@ -140,7 +140,7 @@
id = $"page{PageState.Page.PageId}-script{count}"; 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), location); await interop.IncludeScript(id, "", "", "", "", script.Substring(index, script.IndexOf("</script>") - index), location.ToString().ToLower());
} }
index = content.IndexOf("<script", index + 1); index = content.IndexOf("<script", index + 1);
} }