Merge pull request #4994 from sbwalker/dev

sbwalker · web-flow · commit c4f2abf143da · 2025-01-16T12:26:30.000-05:00
fix #4986 - allow Resources which have Reload specified to be used in Interactive rendering
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
@@ -98,7 +98,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
                     var inline = 0;
                     foreach (Resource resource in resources)
                     {
-                        if ((string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive) && !resource.Reload)
+                        if (string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive)
                         {
                             if (!string.IsNullOrEmpty(resource.Url))
                             {
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
@@ -62,7 +62,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
                     var inline = 0;
                     foreach (Resource resource in resources)
                     {
-                        if ((string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive) && !resource.Reload)
+                        if (string.IsNullOrEmpty(resource.RenderMode) || resource.RenderMode == RenderModes.Interactive)
                         {
                             if (!string.IsNullOrEmpty(resource.Url))
                             {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)`
`98`	`98`	`var inline = 0;`
`99`	`99`	`foreach (Resource resource in resources)`
`100`	`100`	`{`
`101`		`- if ((string.IsNullOrEmpty(resource.RenderMode) \|\| resource.RenderMode == RenderModes.Interactive) && !resource.Reload)`
	`101`	`+ if (string.IsNullOrEmpty(resource.RenderMode) \|\| resource.RenderMode == RenderModes.Interactive)`
`102`	`102`	`{`
`103`	`103`	`if (!string.IsNullOrEmpty(resource.Url))`
`104`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)`
`62`	`62`	`var inline = 0;`
`63`	`63`	`foreach (Resource resource in resources)`
`64`	`64`	`{`
`65`		`- if ((string.IsNullOrEmpty(resource.RenderMode) \|\| resource.RenderMode == RenderModes.Interactive) && !resource.Reload)`
	`65`	`+ if (string.IsNullOrEmpty(resource.RenderMode) \|\| resource.RenderMode == RenderModes.Interactive)`
`66`	`66`	`{`
`67`	`67`	`if (!string.IsNullOrEmpty(resource.Url))`
`68`	`68`	`{`