From 0daa80efa4a18314f30613bd5945d7c1379be016 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 20 Aug 2019 11:01:45 +0100 Subject: [PATCH] Undo some of the changes as we will load it via assetService in the angular main controller & fixes the double load issue --- .../Umbraco/Views/Default.cshtml | 1 - .../Editors/BackOfficeController.cs | 22 ------------------- .../JavaScript/JsInitialization.cs | 20 ----------------- 3 files changed, 43 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml index 00ab8e0166..056d2b6f51 100644 --- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml @@ -128,7 +128,6 @@ - @if (isDebug) { diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 72a9d6f6b1..ca17f534c4 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -211,28 +211,6 @@ namespace Umbraco.Web.Editors return JavaScript(result); } - [MinifyJavaScriptResult(Order = 0)] - [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)] - public JavaScriptResult TinyMceEditor() - { - var files = JsInitialization.OptimizeTinyMceScriptFiles(HttpContext); - - var rawJS = new StringBuilder(); - rawJS.AppendLine("LazyLoad.js(["); - var first = true; - foreach (var file in files) - { - if (first) first = false; - else rawJS.AppendLine(","); - rawJS.Append("\""); - rawJS.Append(file); - rawJS.Append("\""); - - } - rawJS.Append("]);"); - return JavaScript(rawJS.ToString()); - } - /// /// Returns a js array of all of the manifest assets /// diff --git a/src/Umbraco.Web/JavaScript/JsInitialization.cs b/src/Umbraco.Web/JavaScript/JsInitialization.cs index b8726e73c3..17e4f7b094 100644 --- a/src/Umbraco.Web/JavaScript/JsInitialization.cs +++ b/src/Umbraco.Web/JavaScript/JsInitialization.cs @@ -60,26 +60,6 @@ namespace Umbraco.Web.JavaScript return WriteScript(jarray.ToString(), IOHelper.ResolveUrl(SystemDirectories.Umbraco), angularModule); } - public static string GetTinyJavascriptInitialization(HttpContextBase httpContext, IEnumerable scripts) - { - var rawJs = new StringBuilder(); - rawJs.AppendLine("LazyLoad.js(["); - - var first = true; - foreach (var file in scripts) - { - if (first) first = false; - else rawJs.AppendLine(","); - rawJs.Append("\""); - rawJs.Append(file); - rawJs.Append("\""); - - } - rawJs.Append("]);"); - - return rawJs.ToString(); - } - /// /// Returns a list of optimized script paths for the back office ///