Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2011 from sbwalker/dev

Browse Source 
changed IsModule property name to ES6Module for clarity
This commit is contained in:
Shaun Walker 2022-02-20 08:42:34 -05:00 committed by GitHub
commit 7d669caa3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/ModuleBase.cs
View File

@ -55,7 +55,7 @@ namespace Oqtane.Modules
var scripts = new List<object>(); var scripts = new List<object>();
foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global)) foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
{ {
scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", ismodule = resource.IsModule ?? false}); scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
} }
if (scripts.Any()) if (scripts.Any())
{ {

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

@ -34,7 +34,7 @@ namespace Oqtane.Themes
var scripts = new List<object>(); var scripts = new List<object>();
foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global)) foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
{ {
scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", ismodule = resource.IsModule ?? false }); scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
} }
if (scripts.Any()) if (scripts.Any())
{ {

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

@ -232,7 +232,7 @@ Oqtane.Interop = {
if (path === scripts[s].href && scripts[s].crossorigin !== '') { if (path === scripts[s].href && scripts[s].crossorigin !== '') {
element.crossOrigin = scripts[s].crossorigin; element.crossOrigin = scripts[s].crossorigin;
} }
if (path === scripts[s].href && scripts[s].ismodule === true) { if (path === scripts[s].href && scripts[s].es6module === true) {
element.type = "module"; element.type = "module";
} }
} }

2
Oqtane.Shared/Models/Resource.cs
View File

@ -45,6 +45,6 @@ namespace Oqtane.Models
/// <summary> /// <summary>
/// For Scripts this allows type="module" registrations - not applicable to Stylesheets /// For Scripts this allows type="module" registrations - not applicable to Stylesheets
/// </summary> /// </summary>
public bool? IsModule { get; set; } public bool ES6Module { get; set; }
} }
} }