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

Merge pull request #2823 from sbwalker/dev

Browse Source 
add support for type attribute in JSInterop IncludeScript
This commit is contained in:
Shaun Walker
2023-05-18 09:36:23 -04:00
committed by GitHub
parent 62deffd017 076d150f72
commit d16659890c
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Oqtane.Client/UI/Interop.cs
View File

@ -92,12 +92,17 @@ namespace Oqtane.UI
// external scripts need to specify src, inline scripts need to specify id and content
public Task IncludeScript(string id, string src, string integrity, string crossorigin, string content, string location)
{
return IncludeScript(id, src, integrity, crossorigin, "", content, location);
}
public Task IncludeScript(string id, string src, string integrity, string crossorigin, string type, string content, string location)
{
try
{
_jsRuntime.InvokeVoidAsync(
"Oqtane.Interop.includeScript",
id, src, integrity, crossorigin, content, location);
id, src, integrity, crossorigin, type, content, location);
return Task.CompletedTask;
}
catch

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

@ -84,10 +84,10 @@
var script = PageState.Page.HeadContent.Substring(index, PageState.Page.HeadContent.IndexOf("</script>", index) + 9 - index);
var attributes = script.Substring(0, script.IndexOf(">")).Replace("\"", "").Split(" ");
string id = "";
string url = "";
string src = "";
string integrity = "";
string crossorigin = "";
bool es6module = false;
string type = "";
foreach (var attribute in attributes)
{
if (attribute.Contains("="))
@ -99,7 +99,7 @@
id = value[1];
break;
case "src":
url = value[1];
src = value[1];
break;
case "integrity":
integrity = value[1];
@ -108,15 +108,15 @@
crossorigin = value[1];
break;
case "type":
es6module = (value[1] == "module");
type = value[1];
break;
}
}
}
if (!string.IsNullOrEmpty(url))
if (!string.IsNullOrEmpty(src))
{
url = (url.Contains("://")) ? url : PageState.Alias.BaseUrl + url;
await interop.IncludeScript(id, url, integrity, crossorigin, "", "head");
src = (src.Contains("://")) ? src : PageState.Alias.BaseUrl + src;
await interop.IncludeScript(id, src, integrity, crossorigin, type, "", "head");
}
else
{