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

consolidate Clone logic for Resource objects

Browse Source
This commit is contained in:
sbwalker
2024-03-08 19:33:09 -05:00
parent 7f74e79253
commit 8e287da7b5
7 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/UI/RenderModeBoundary.razor
View File

@ -71,7 +71,7 @@
if (ModuleType != null)
{
// repopulate the SiteState service based on the values passed in the SiteState parameter (this is how state is marshalled across the render mode boundary)
ComponentSiteState.Clone(SiteState);
ComponentSiteState.Hydrate(SiteState);
DynamicComponent = builder =>
{

31
Oqtane.Client/UI/SiteRouter.razor
View File

@ -569,21 +569,22 @@
// ensure resource does not exist already
if (!pageresources.Exists(item => item.Url.ToLower() == resource.Url.ToLower()))
{
pageresources.Add(new Resource
{
ResourceType = resource.ResourceType,
Url = resource.Url,
Integrity = resource.Integrity,
CrossOrigin = resource.CrossOrigin,
Bundle = resource.Bundle,
Location = resource.Location,
ES6Module = resource.ES6Module,
Content = resource.Content,
RenderMode = resource.RenderMode,
Reload = resource.Reload,
Level = level,
Namespace = name
});
pageresources.Add(resource.Clone(level, name));
// pageresources.Add(new Resource
// {
// ResourceType = resource.ResourceType,
// Url = resource.Url,
// Integrity = resource.Integrity,
// CrossOrigin = resource.CrossOrigin,
// Bundle = resource.Bundle,
// Location = resource.Location,
// ES6Module = resource.ES6Module,
// Content = resource.Content,
// RenderMode = resource.RenderMode,
// Reload = resource.Reload,
// Level = level,
// Namespace = name
// });
}
}
}