From ef5fc2e7b22536311f0e0f9d10529fb1b9237103 Mon Sep 17 00:00:00 2001 From: Warren Date: Mon, 6 Aug 2018 13:05:07 +0100 Subject: [PATCH] Add back in bundle control - seems to fix up Macro Editor --- src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs | 15 +++++++++++++++ src/Umbraco.Web/Umbraco.Web.csproj | 1 + 2 files changed, 16 insertions(+) create mode 100644 src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs diff --git a/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs b/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs new file mode 100644 index 0000000000..c5fcdb858b --- /dev/null +++ b/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs @@ -0,0 +1,15 @@ +using System.Web.UI; +using ClientDependency.Core; +namespace Umbraco.Web.UI.Bundles +{ + /// + /// The core Jquery libs + /// + [ClientDependency(ClientDependencyType.Javascript, "modal/jquery.simplemodal.1.4.1.custom.js", "UmbracoClient", Priority = 2, Group = 4)] + [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery.cookie.js", "UmbracoClient", Priority = 3, Group = 4)] + [ClientDependency(ClientDependencyType.Javascript, "Application/JQuery/jquery.metadata.min.js", "UmbracoClient", Priority = 4, Group = 4)] + [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery.hotkeys.js", "UmbracoClient", Priority = 5, Group = 4)] + public class JsJQueryPlugins : Control + { + } +} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 5f130a8fd0..ee54aca612 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -442,6 +442,7 @@ + ASPXCodeBehind