Skip to content

Commit 7ff3b1f

Browse files
donkerdonker
committed
First sweep of repairs after merging of latest dev branch
1 parent affe60b commit 7ff3b1f

File tree

21 files changed

+242
-720
lines changed

21 files changed

+242
-720
lines changed

‎DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<Compile Include="Controls\DnnJsInclude.cs" />
125125
<Compile Include="AssemblyInfo.cs" />
126126
<Compile Include="ClientResourceSettings.cs" />
127-
<Compile Include="MvcClientResourceManager.cs" />
128127
<Compile Include="Providers\DnnBodyProvider.cs" />
129128
<Compile Include="Providers\DnnCompositeFileProcessingProvider.cs" />
130129
<Compile Include="Providers\DnnFileRegistrationProvider.cs" />

‎DNN Platform/DotNetNuke.Web.Client/MvcClientResourceManager.cs‎

Lines changed: 0 additions & 588 deletions
This file was deleted.

‎DNN Platform/DotNetNuke.Web.MvcPipeline/Containers/SkinHelpers.Content.cs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,17 @@
55
namespace DotNetNuke.Web.MvcPipeline.Containers
66
{
77
using System;
8-
using System.Collections.Generic;
98
using System.IO;
10-
using System.Linq;
119
using System.Web;
1210
using System.Web.Mvc;
1311
using System.Web.Mvc.Html;
14-
using System.Web.Routing;
12+
13+
using DotNetNuke.Abstractions.ClientResources;
1514
using DotNetNuke.Common;
1615
using DotNetNuke.Common.Internal;
17-
using DotNetNuke.Common.Utilities;
18-
using DotNetNuke.Entities.Portals;
19-
using DotNetNuke.Framework;
2016
using DotNetNuke.Framework.JavaScriptLibraries;
21-
using DotNetNuke.Web.Client.ClientResourceManagement;
17+
using DotNetNuke.Services.ClientDependency;
18+
using DotNetNuke.Web.Client.ResourceManager;
2219
using DotNetNuke.Web.MvcPipeline.Framework.JavascriptLibraries;
2320
using DotNetNuke.Web.MvcPipeline.Models;
2421

@@ -49,7 +46,8 @@ public static IHtmlString Content(this HtmlHelper<ContainerModel> htmlHelper)
4946
}
5047

5148
// register admin.css
52-
MvcClientResourceManager.RegisterAdminStylesheet(htmlHelper.ViewContext, Globals.HostPath + "admin.css");
49+
var controller = GetClientResourcesController();
50+
controller.RegisterStylesheet(Globals.HostPath + "admin.css", FileOrder.Css.AdminCss, false);
5351
}
5452

5553
if (!string.IsNullOrEmpty(model.ContentPaneStyle))
@@ -156,8 +154,8 @@ public static IHtmlString Content(this HtmlHelper<ContainerModel> htmlHelper)
156154
var req = request.Params;
157155
var isMyRoute = req["MODULEID"] != null && req["CONTROLLER"] != null && int.TryParse(req["MODULEID"], out var moduleId) && moduleId == model.ModuleConfiguration.ModuleID;
158156

159-
var url = isMyRoute ?
160-
request.Url.ToString() :
157+
var url = isMyRoute ?
158+
request.Url.ToString() :
161159
TestableGlobals.Instance.NavigateURL(model.ModuleConfiguration.TabID, TestableGlobals.Instance.IsHostTab(model.ModuleConfiguration.TabID), model.PortalSettings, string.Empty, routeValues);
162160

163161
moduleContentPaneDiv.InnerHtml += $"<form action=\"{url}\" method=\"post\">";

‎DNN Platform/DotNetNuke.Web.MvcPipeline/Containers/SkinHelpers.Title.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ namespace DotNetNuke.Web.MvcPipeline.Containers
77
using System;
88
using System.Web;
99
using System.Web.Mvc;
10-
using System.Web.Mvc.Html;
1110

12-
using DotNetNuke.Common;
13-
using DotNetNuke.Common.Utilities;
14-
using DotNetNuke.Entities.Modules;
1511
using DotNetNuke.Web.MvcPipeline.Models;
1612

1713
public static partial class SkinHelpers

‎DNN Platform/DotNetNuke.Web.MvcPipeline/Containers/SkinHelpers.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using DotNetNuke.Abstractions.ClientResources;
2+
using Microsoft.Extensions.DependencyInjection;
3+
4+
namespace DotNetNuke.Web.MvcPipeline.Containers
5+
{
6+
public static partial class SkinHelpers
7+
{
8+
private static IClientResourceController GetClientResourcesController()
9+
{
10+
var serviceProvider = Common.Globals.GetCurrentServiceProvider();
11+
return serviceProvider.GetRequiredService<IClientResourceController>();
12+
}
13+
}
14+
}

‎DNN Platform/DotNetNuke.Web.MvcPipeline/Framework/JavascriptLibraries/MvcJavaScript.cs‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
namespace DotNetNuke.Web.MvcPipeline.Framework.JavascriptLibraries
22
{
33
using System;
4+
using System.Collections;
45
using System.Collections.Generic;
56
using System.Globalization;
67
using System.Linq;
78
using System.Web;
89
using System.Web.Mvc;
9-
10+
using DotNetNuke.Abstractions.ClientResources;
1011
using DotNetNuke.Common;
1112
using DotNetNuke.Common.Utilities;
1213
using DotNetNuke.Entities.Controllers;
@@ -18,9 +19,9 @@
1819
using DotNetNuke.Services.Localization;
1920
using DotNetNuke.Services.Log.EventLog;
2021
using DotNetNuke.UI.Utilities;
21-
using DotNetNuke.Web.Client;
22-
using DotNetNuke.Web.Client.ClientResourceManagement;
22+
using DotNetNuke.Web.Client.ResourceManager;
2323
using DotNetNuke.Web.MvcPipeline.UI.Utilities;
24+
using Microsoft.Extensions.DependencyInjection;
2425

2526
public class MvcJavaScript
2627
{
@@ -160,6 +161,8 @@ public static string GetScriptPath(string libraryName)
160161

161162
public static void RegisterClientReference(ControllerContext page, ClientAPI.ClientNamespaceReferences reference)
162163
{
164+
var controller = GetClientResourcesController();
165+
163166
switch (reference)
164167
{
165168
case ClientAPI.ClientNamespaceReferences.dnn:
@@ -170,8 +173,14 @@ public static void RegisterClientReference(ControllerContext page, ClientAPI.Cli
170173
}
171174

172175
// MvcClientResourceManager.RegisterScript(page, ClientAPI.ScriptPath + "MicrosoftAjax.js", 10);
173-
MvcClientResourceManager.RegisterScript(page, ClientAPI.ScriptPath + "mvc.js", 11);
174-
MvcClientResourceManager.RegisterScript(page, ClientAPI.ScriptPath + "dnn.js", 12);
176+
controller.CreateScript()
177+
.FromSrc(ClientAPI.ScriptPath + "mvc.js")
178+
.SetPriority(11)
179+
.Register();
180+
controller.CreateScript()
181+
.FromSrc(ClientAPI.ScriptPath + "dnn.js")
182+
.SetPriority(12)
183+
.Register();
175184
HttpContextSource.Current.Items.Add(LegacyPrefix + "dnn.js", true);
176185

177186
// page.ClientScript.RegisterClientScriptBlock(page.GetType(), "dnn.js", string.Empty);
@@ -188,7 +197,10 @@ public static void RegisterClientReference(ControllerContext page, ClientAPI.Cli
188197
break;
189198
case ClientAPI.ClientNamespaceReferences.dnn_dom_positioning:
190199
RegisterClientReference(page, ClientAPI.ClientNamespaceReferences.dnn);
191-
MvcClientResourceManager.RegisterScript(page, ClientAPI.ScriptPath + "dnn.dom.positioning.js", 13);
200+
controller.CreateScript()
201+
.FromSrc(ClientAPI.ScriptPath + "dnn.dom.positioning.js")
202+
.SetPriority(13)
203+
.Register();
192204
break;
193205
}
194206
}
@@ -429,7 +441,13 @@ private static void RegisterScript(ControllerContext page, JavaScriptLibrary jsl
429441
return;
430442
}
431443

432-
MvcClientResourceManager.RegisterScript(page, GetScriptPath(jsl, HttpContextSource.Current?.Request), GetFileOrder(jsl), GetScriptLocation(jsl), jsl.LibraryName, jsl.Version.ToString(3));
444+
var controller = GetClientResourcesController();
445+
controller.CreateScript()
446+
.FromSrc(GetScriptPath(jsl, HttpContextSource.Current?.Request), GetScriptLocation(jsl))
447+
.SetPriority(GetFileOrder(jsl))
448+
.SetNameAndVersion(jsl.LibraryName, jsl.Version.ToString(3), false)
449+
.Register();
450+
433451
/*
434452
if (Host.CdnEnabled && !string.IsNullOrEmpty(jsl.ObjectName))
435453
{
@@ -479,5 +497,11 @@ private static int GetFileOrder(JavaScriptLibrary jsl)
479497
return jsl.PackageID + (int)FileOrder.Js.DefaultPriority;
480498
}
481499
}
500+
501+
private static IClientResourceController GetClientResourcesController()
502+
{
503+
var serviceProvider = DotNetNuke.Common.Globals.GetCurrentServiceProvider();
504+
return serviceProvider.GetRequiredService<IClientResourceController>();
505+
}
482506
}
483507
}

‎DNN Platform/DotNetNuke.Web.MvcPipeline/Framework/MvcServicesFrameworkImpl.cs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
using System.Web.Mvc;
66
using System.Web.UI;
77

8+
using DotNetNuke.Abstractions.ClientResources;
89
using DotNetNuke.Common;
910
using DotNetNuke.Entities.Portals;
1011
using DotNetNuke.Framework;
1112
using DotNetNuke.Framework.JavaScriptLibraries;
13+
using DotNetNuke.Services.ClientDependency;
1214
using DotNetNuke.UI.Utilities;
13-
using DotNetNuke.Web.Client.ClientResourceManagement;
1415
using DotNetNuke.Web.MvcPipeline.Framework.JavascriptLibraries;
1516
using DotNetNuke.Web.MvcPipeline.UI.Utilities;
17+
using Microsoft.Extensions.DependencyInjection;
1618

1719
internal class MvcServicesFrameworkImpl : IMvcServicesFramework, IMvcServiceFrameworkInternals
1820
{
@@ -78,7 +80,8 @@ public void RegisterAjaxScript(Page page)
7880
scriptPath = "~/js/dnn.servicesframework.js";
7981
}
8082

81-
ClientResourceManager.RegisterScript(page, scriptPath);
83+
var controller = GetClientResourcesController();
84+
controller.RegisterScript(scriptPath);
8285
}
8386

8487
public void RegisterAjaxScript(ControllerContext page)
@@ -103,7 +106,8 @@ public void RegisterAjaxScript(ControllerContext page)
103106
scriptPath = "~/js/dnn.servicesframework.js";
104107
}
105108

106-
MvcClientResourceManager.RegisterScript(page, scriptPath);
109+
var controller = GetClientResourcesController();
110+
controller.RegisterScript(scriptPath);
107111
}
108112

109113
private static void SetKey(string key)
@@ -120,5 +124,11 @@ public void RegisterAjaxAntiForgery(ControllerContext page)
120124
{
121125
throw new System.NotImplementedException();
122126
}
127+
128+
private static IClientResourceController GetClientResourcesController()
129+
{
130+
var serviceProvider = DotNetNuke.Common.Globals.GetCurrentServiceProvider();
131+
return serviceProvider.GetRequiredService<IClientResourceController>();
132+
}
123133
}
124134
}

‎DNN Platform/DotNetNuke.Web.MvcPipeline/Modules/ModuleHelpers.TextEditor.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ namespace DotNetNuke.Web.MvcPipeline.Containers
1212
using System.Web.Mvc;
1313
using System.Web.Mvc.Html;
1414

15-
using DotNetNuke.Common;
1615
using DotNetNuke.Entities.Portals;
1716
using DotNetNuke.Framework.JavaScriptLibraries;
18-
using DotNetNuke.Web.Client.ClientResourceManagement;
17+
using DotNetNuke.Services.ClientDependency;
18+
using DotNetNuke.Web.Client.ResourceManager;
1919

2020
public static partial class ModuleHelpers
2121
{
@@ -128,9 +128,10 @@ private static void LoadAllSettings(ViewContext page, string id)
128128
*/
129129
if (page.IsChildAction)
130130
{
131-
MvcClientResourceManager.RegisterStyleSheet(page, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/css/CKEditorToolBars.css"));
132-
MvcClientResourceManager.RegisterStyleSheet(page, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/css/CKEditorOverride.css"));
133-
MvcClientResourceManager.RegisterStyleSheet(page, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.18.0/editor.css"));
131+
var controller = GetClientResourcesController();
132+
controller.RegisterStylesheet("~/Providers/HtmlEditorProviders/DNNConnect.CKE/css/CKEditorToolBars.css");
133+
controller.RegisterStylesheet("~/Providers/HtmlEditorProviders/DNNConnect.CKE/css/CKEditorOverride.css");
134+
controller.RegisterStylesheet("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.18.0/editor.css");
134135

135136
/*
136137
const string CsName = "CKEdScript";
@@ -139,8 +140,8 @@ private static void LoadAllSettings(ViewContext page, string id)
139140

140141
JavaScript.RequestRegistration(CommonJs.jQuery);
141142

142-
MvcClientResourceManager.RegisterScript(page, "~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.18.0/ckeditor.js");
143-
MvcClientResourceManager.RegisterScript(page, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/editorOverride.js"));
143+
controller.RegisterScript("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.18.0/ckeditor.js");
144+
controller.RegisterScript("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/editorOverride.js");
144145
}
145146

146147
/*

‎DNN Platform/DotNetNuke.Web.MvcPipeline/Modules/ModuleHelpers.cs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information
44

5-
namespace DotNetNuke.Web.Mvc.Page
5+
namespace DotNetNuke.Web.MvcPipeline.Containers
66
{
77
using System;
8-
using System.Collections.Generic;
9-
using System.Linq;
10-
using System.Text;
11-
using System.Threading.Tasks;
8+
using System.Collections;
129
using System.Web;
1310
using System.Web.Mvc;
1411

12+
using DotNetNuke.Abstractions.ClientResources;
1513
using DotNetNuke.Services.Localization;
14+
using Microsoft.Extensions.DependencyInjection;
1615

17-
public static class ModuleHelpers
16+
public static partial class ModuleHelpers
1817
{
1918
public static IHtmlString LocalizeString(this HtmlHelper htmlHelper, string key, string localResourceFile)
2019
{
2120
return MvcHtmlString.Create(Localization.GetString(key, localResourceFile));
2221
}
22+
23+
private static IClientResourceController GetClientResourcesController()
24+
{
25+
var serviceProvider = Common.Globals.GetCurrentServiceProvider();
26+
return serviceProvider.GetRequiredService<IClientResourceController>();
27+
}
2328
}
2429
}

‎DNN Platform/DotNetNuke.Web.MvcPipeline/PermissionTriStateHelper.cs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@
44

55
namespace DotNetNuke.MvcPipeline
66
{
7+
using System;
8+
using System.Collections;
9+
using System.Web;
710
using System.Web.Mvc;
8-
11+
using DotNetNuke.Abstractions.ClientResources;
912
using DotNetNuke.Entities.Icons;
1013
using DotNetNuke.Framework.JavaScriptLibraries;
14+
using DotNetNuke.Services.ClientDependency;
1115
using DotNetNuke.Services.Localization;
12-
using DotNetNuke.Web.Client.ClientResourceManagement;
16+
using DotNetNuke.Web.Client.ResourceManager;
1317
using DotNetNuke.Web.MvcPipeline.Framework.JavascriptLibraries;
1418
using DotNetNuke.Web.MvcPipeline.UI.Utilities;
19+
using Microsoft.Extensions.DependencyInjection;
1520

1621
public static class PermissionTriStateHelper
1722
{
@@ -27,7 +32,8 @@ public static MvcHtmlString PermissionTriState(
2732
{
2833
const string scriptKey = "initTriState";
2934
MvcJavaScript.RequestRegistration(CommonJs.jQuery);
30-
MvcClientResourceManager.RegisterScript(helper.ViewContext, "/js/dnn.permissiontristate.js");
35+
var controller = GetClientResourcesController();
36+
controller.RegisterScript("/js/dnn.permissiontristate.js");
3137
MvcClientAPI.RegisterStartupScript(scriptKey, GetInitScript());
3238

3339
var grantImagePath = IconController.IconURL("Grant");
@@ -136,5 +142,11 @@ private static void LookupScriptValues(out string grantImagePath, out string den
136142
denyAltText = Localization.GetString("PermissionTypeDeny");
137143
nullAltText = Localization.GetString("PermissionTypeNull");
138144
}
145+
146+
private static IClientResourceController GetClientResourcesController()
147+
{
148+
var serviceProvider = DotNetNuke.Common.Globals.GetCurrentServiceProvider();
149+
return serviceProvider.GetRequiredService<IClientResourceController>();
150+
}
139151
}
140152
}

0 commit comments

Comments
 (0)