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

Merge pull request #1934 from oqtane/revert-1931-dev

Browse Source 
Revert "Fixed first render js bug"
This commit is contained in:
Shaun Walker
2022-01-12 14:09:08 -05:00
committed by GitHub
parent cfe8059176 dda71e5ccd
commit dbd6cc4148
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,19 +46,22 @@ namespace Oqtane.Modules
// base lifecycle method for handling JSInterop script registration // base lifecycle method for handling JSInterop script registration
protected override async Task OnInitializedAsync() protected override async Task OnAfterRenderAsync(bool firstRender)
{ {
if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script)) if (firstRender)
{ {
var scripts = new List<object>(); if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
{ {
scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" }); var scripts = new List<object>();
} foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
if (scripts.Any()) {
{ scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
var interop = new Interop(JSRuntime); }
await interop.IncludeScripts(scripts.ToArray()); if (scripts.Any())
{
var interop = new Interop(JSRuntime);
await interop.IncludeScripts(scripts.ToArray());
}
} }
} }
} }