From 6430137fe37cda128f417a2f2d6bcd5c0fc368b2 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 31 Mar 2020 16:35:17 +0200 Subject: [PATCH] AB#5822 Clean up --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 +------- .../PartialViewMacros/Templates/EditProfile.cshtml | 13 ++++++++----- .../PartialViewMacros/Templates/Gallery.cshtml | 1 + .../PartialViewMacros/Templates/Login.cshtml | 11 +++++++---- .../Templates/RegisterMember.cshtml | 13 ++++++++----- .../Views/Partials/Grid/Editors/Media.cshtml | 2 +- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index ffdae0a9e0..af30a30485 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -62,9 +62,6 @@ - - ..\..\..\..\.nuget\packages\smidge\3.1.0\lib\netcoreapp3.0\Smidge.dll - @@ -111,9 +108,6 @@ runtime; build; native; contentfiles; analyzers all - - 3.1.0 - @@ -429,4 +423,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml index 2bca35516a..dd71635424 100644 --- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml @@ -1,4 +1,6 @@ -@using Umbraco.Web.Composing +@using System.Web.Mvc.Html +@using Umbraco.Web +@using Umbraco.Web.Composing @using Umbraco.Web.Controllers @inherits Umbraco.Web.Macros.PartialViewMacroPage @@ -10,15 +12,16 @@ var runtimeMinifier = Current.RuntimeMinifier; - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco"); - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco"); - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco"); + runtimeMinifier.RequiresJs("umbraco", + "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", + "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", + "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"); var success = TempData["ProfileUpdateSuccess"] != null; } @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@ -@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco")); +@Html.Raw(runtimeMinifier.RenderJsHere("umbraco")); @if (Current.MembershipHelper.IsLoggedIn() && profileModel != null) { diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml index 9462b3b638..557529fb5e 100755 --- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml @@ -1,6 +1,7 @@ @using Umbraco.Core.Models.PublishedContent @using Umbraco.Web @using Umbraco.Core +@using Umbraco.Core.Media @using Umbraco.Core.Models @using Umbraco.Web.Composing @inherits Umbraco.Web.Macros.PartialViewMacroPage diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml index 51b9c324ec..763033a39d 100644 --- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml @@ -1,3 +1,5 @@ +@using System.Web.Mvc.Html +@using Umbraco.Web @using Umbraco.Web.Composing @using Umbraco.Web.Models @using Umbraco.Web.Controllers @@ -12,13 +14,14 @@ var runtimeMinifier = Current.RuntimeMinifier; - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco"); - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco"); - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco"); + runtimeMinifier.RequiresJs("umbraco", + "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", + "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", + "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"); } @* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@ -@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco")) +@Html.Raw(runtimeMinifier.RenderJsHere("umbraco")) @using (Html.BeginUmbracoForm("HandleLogin")) { diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml index 1faec56dbf..abd6283b48 100644 --- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml @@ -1,4 +1,6 @@ -@using Umbraco.Web.Composing +@using System.Web.Mvc.Html +@using Umbraco.Web +@using Umbraco.Web.Composing @using Umbraco.Web.Controllers @inherits Umbraco.Web.Macros.PartialViewMacroPage @@ -34,15 +36,16 @@ var runtimeMinifier = Current.RuntimeMinifier; - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco"); - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco"); - runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco"); + runtimeMinifier.RequiresJs("umbraco", + "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", + "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", + "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"); var success = TempData["FormSuccess"] != null; } @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@ -@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco")); +@Html.Raw(runtimeMinifier.RenderJsHere("umbraco")); @if (success) { diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml index 0ed54ab958..9e5daaad5d 100644 --- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml @@ -1,5 +1,5 @@ @model dynamic -@using Umbraco.Web.Templates +@using Umbraco.Core.Media @if (Model.value != null) {