yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo some of the changes as we will load it via assetService in the angular main controller & fixes the double load issue

Browse Source
This commit is contained in:
Warren Buckley
2019-08-20 11:01:45 +01:00
parent b9b4721295
commit 0daa80efa4
3 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -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());
}
/// <summary>
/// Returns a js array of all of the manifest assets
/// </summary>

20
src/Umbraco.Web/JavaScript/JsInitialization.cs
View File

@@ -60,26 +60,6 @@ namespace Umbraco.Web.JavaScript
return WriteScript(jarray.ToString(), IOHelper.ResolveUrl(SystemDirectories.Umbraco), angularModule);
}
public static string GetTinyJavascriptInitialization(HttpContextBase httpContext, IEnumerable<string> 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();
}
/// <summary>
/// Returns a list of optimized script paths for the back office
/// </summary>