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

fix #2912 - move JavaScript handling from ThemeBuilder to component OnAfterRenderAsync

Browse Source
This commit is contained in:
sbwalker
2023-06-21 08:31:51 -04:00
parent c8a679ecce
commit 8067b2e634
5 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ using Oqtane.UI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
namespace Oqtane.Themes
@ -33,12 +34,28 @@ namespace Oqtane.Themes
{
if (firstRender)
{
if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
List<Resource> resources = null;
var type = GetType();
if (type.BaseType == typeof(ThemeBase))
{
if (PageState.Page.Resources != null)
{
resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Namespace == type.Namespace).ToList();
}
}
else // themecontrolbase, containerbase
{
if (Resources != null)
{
resources = Resources.Where(item => item.ResourceType == ResourceType.Script).ToList();
}
}
if (resources != null && resources.Any())
{
var interop = new Interop(JSRuntime);
var scripts = new List<object>();
var inline = 0;
foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
foreach (Resource resource in resources)
{
if (!string.IsNullOrEmpty(resource.Url))
{