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

migrate CSS references and remove JS Interop methods

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Pages/_Host.cshtml
View File

@ -12,8 +12,6 @@
<script src="js/loadjs.min.js"></script>
<link rel="stylesheet" href="css/app.css" />
@Html.Raw(Model.HeadResources)
<link id="app-stylesheet-page" rel="stylesheet" href="css/empty.css" disabled />
<link id="app-stylesheet-module" rel="stylesheet" href="css/empty.css" disabled />
<component type="typeof(Oqtane.Head)" render-mode="@((RenderMode)Enum.Parse(typeof(RenderMode), Model.RenderMode, true))" />
</head>
<body>

31
Oqtane.Server/Pages/_Host.cshtml.cs
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;

0
Oqtane.Server/wwwroot/css/empty.css
View File

14
Oqtane.Server/wwwroot/js/interop.js
View File

@ -108,11 +108,6 @@ Oqtane.Interop = {
}
}
},
includeLinks: function (links) {
for (let i = 0; i < links.length; i++) {
this.includeLink(links[i].id, links[i].rel, links[i].href, links[i].type, links[i].integrity, links[i].crossorigin, links[i].insertbefore);
}
},
includeScript: function (id, src, integrity, crossorigin, content, location) {
var script;
if (src !== "") {
@ -249,15 +244,6 @@ Oqtane.Interop = {
}
return getAbsoluteUrl(url);
},
removeElementsById: function (prefix, first, last) {
var elements = document.querySelectorAll('[id^=' + prefix + ']');
for (var i = elements.length - 1; i >= 0; i--) {
var element = elements[i];
if (element.id.startsWith(prefix) && (first === '' || element.id >= first) && (last === '' || element.id <= last)) {
element.parentNode.removeChild(element);
}
}
},
getElementByName: function (name) {
var elements = document.getElementsByName(name);
if (elements.length) {