integrate old logic for managing stylesheets using JS Interop
This commit is contained in:
@ -15,6 +15,8 @@
|
||||
{
|
||||
<link id="app-manifest" rel="manifest" />
|
||||
}
|
||||
<style id="app-stylesheet-page"></style>
|
||||
<style id="app-stylesheet-module"></style>
|
||||
<component type="typeof(Oqtane.Head)" render-mode="@((RenderMode)Enum.Parse(typeof(RenderMode), Model.RenderMode, true))" />
|
||||
@Html.Raw(Model.HeadResources)
|
||||
</head>
|
||||
|
@ -19,6 +19,8 @@ using Microsoft.Extensions.Primitives;
|
||||
using Oqtane.Enums;
|
||||
using Oqtane.Security;
|
||||
using Oqtane.Extensions;
|
||||
using Oqtane.Themes;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Oqtane.Pages
|
||||
{
|
||||
@ -163,7 +165,29 @@ namespace Oqtane.Pages
|
||||
}
|
||||
}
|
||||
|
||||
// inject scripts
|
||||
// stylesheets
|
||||
var resources = new List<Resource>();
|
||||
if (string.IsNullOrEmpty(page.ThemeType))
|
||||
{
|
||||
page.ThemeType = site.DefaultThemeType;
|
||||
}
|
||||
var theme = site.Themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType));
|
||||
if (theme != null)
|
||||
{
|
||||
resources.AddRange(theme.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
|
||||
}
|
||||
var type = Type.GetType(page.ThemeType);
|
||||
if (type != null)
|
||||
{
|
||||
var obj = Activator.CreateInstance(type) as IThemeControl;
|
||||
if (obj.Resources != null)
|
||||
{
|
||||
resources.AddRange(obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
|
||||
}
|
||||
}
|
||||
ManageResources(resources, alias, theme.ThemeName);
|
||||
|
||||
// scripts
|
||||
if (Runtime == "Server")
|
||||
{
|
||||
ReconnectScript = CreateReconnectScript();
|
||||
@ -468,5 +492,31 @@ namespace Oqtane.Pages
|
||||
CookieRequestCultureProvider.DefaultCookieName,
|
||||
CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)));
|
||||
}
|
||||
|
||||
private void ManageResources(List<Resource> resources, Alias alias, string name)
|
||||
{
|
||||
if (resources != null)
|
||||
{
|
||||
int count = 0;
|
||||
foreach (var resource in resources)
|
||||
{
|
||||
if (resource.Url.StartsWith("~"))
|
||||
{
|
||||
resource.Url = resource.Url.Replace("~", "/Themes/" + name + "/").Replace("//", "/");
|
||||
}
|
||||
if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl))
|
||||
{
|
||||
resource.Url = alias.BaseUrl + resource.Url;
|
||||
}
|
||||
|
||||
if (!HeadResources.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
count++;
|
||||
string id = "id=\"app-stylesheet-" + ResourceLevel.Page.ToString().ToLower() + "-" + DateTime.UtcNow.ToString("yyyyMMddHHmmssfff") + "-" + count.ToString("00") + "\" ";
|
||||
HeadResources += "<link " + id + "rel=\"stylesheet\" href=\"" + resource.Url + "\"" + (!string.IsNullOrEmpty(resource.Integrity) ? " integrity=\"" + resource.Integrity + "\"" : "") + (!string.IsNullOrEmpty(resource.CrossOrigin) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") + " type=\"text/css\"/>" + Environment.NewLine;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -99,7 +99,8 @@ namespace Oqtane.Repository
|
||||
{
|
||||
var site = GetSite(alias.SiteId);
|
||||
|
||||
_themeRepository.GetThemes();
|
||||
// load themes and module definitions
|
||||
site.Themes = _themeRepository.GetThemes().ToList();
|
||||
var moduleDefinitions = _moduleDefinitionRepository.GetModuleDefinitions(alias.SiteId);
|
||||
|
||||
// site migrations
|
||||
|
@ -108,6 +108,11 @@ 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, type, content, location) {
|
||||
var script;
|
||||
if (src !== "") {
|
||||
@ -234,6 +239,15 @@ 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) {
|
||||
|
Reference in New Issue
Block a user