migrate CSS references and remove JS Interop methods

This commit is contained in:
sbwalker
2023-05-16 09:09:18 -04:00
parent 5e652364c9
commit 89ada83012
7 changed files with 25 additions and 104 deletions

View File

@ -148,18 +148,9 @@ namespace Oqtane.Pages
{
page = _pages.GetPage(site.HomePageId.Value);
}
if (page != null && !page.IsDeleted)
if (page == null || page.IsDeleted)
{
// include theme resources
if (!string.IsNullOrEmpty(page.ThemeType))
{
ThemeType = page.ThemeType;
}
ProcessThemeResources(ThemeType, alias);
}
else // page not found
{
// look for url mapping
// page not found - look for url mapping
var urlMapping = _urlMappings.GetUrlMapping(site.SiteId, route.PagePath);
if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
{
@ -385,24 +376,6 @@ namespace Oqtane.Pages
}
}
private void ProcessThemeResources(string ThemeType, Alias alias)
{
var type = Type.GetType(ThemeType);
if (type != null)
{
var obj = Activator.CreateInstance(type) as IThemeControl;
if (obj.Resources != null)
{
int count = 1;
foreach (var resource in obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
{
resource.Level = ResourceLevel.Page;
ProcessResource(resource, count++, alias);
}
}
}
}
private void ProcessResource(Resource resource, int count, Alias alias)
{
var url = (resource.Url.Contains("://")) ? resource.Url : alias.BaseUrl + resource.Url;