From dda71e5ccd3dbc95e66f500a85f0e2a150591eea Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Wed, 12 Jan 2022 14:07:50 -0500 Subject: [PATCH] Revert "Fixed first render js bug" --- Oqtane.Client/Modules/ModuleBase.cs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs index 5b93c3c5..f3f06aee 100644 --- a/Oqtane.Client/Modules/ModuleBase.cs +++ b/Oqtane.Client/Modules/ModuleBase.cs @@ -46,19 +46,22 @@ namespace Oqtane.Modules // 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(); - foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global)) + if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script)) { - scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" }); - } - if (scripts.Any()) - { - var interop = new Interop(JSRuntime); - await interop.IncludeScripts(scripts.ToArray()); + var scripts = new List(); + 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 ?? "" }); + } + if (scripts.Any()) + { + var interop = new Interop(JSRuntime); + await interop.IncludeScripts(scripts.ToArray()); + } } } }