diff --git a/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs b/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs new file mode 100644 index 0000000000..a34c6c6abd --- /dev/null +++ b/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs @@ -0,0 +1,13 @@ +using Microsoft.AspNetCore.Mvc; + +namespace Umbraco.Web.Common.ActionResults +{ + public class JavaScriptResult : ContentResult + { + public JavaScriptResult(string script) + { + this.Content = script; + this.ContentType = "application/javascript"; + } + } +} diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs index c8e0d71f80..ddc1287a42 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Core.Runtime; using Umbraco.Web.BackOffice.Filters; +using Umbraco.Web.Common.ActionResults; namespace Umbraco.Web.BackOffice.Controllers { @@ -31,21 +32,5 @@ namespace Umbraco.Web.BackOffice.Controllers return new JavaScriptResult(result); } - - public IActionResult Reset() - { - _runtimeMinifier.Reset(); - - return Content("OK"); - } - } - - public class JavaScriptResult : ContentResult - { - public JavaScriptResult(string script) - { - this.Content = script; - this.ContentType = "application/javascript"; - } } } diff --git a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs index f1402bbd0b..59e0288030 100644 --- a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs +++ b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Umbraco.Core.Assets; using Umbraco.Core.Runtime; using Umbraco.Web.BackOffice.Controllers; +using Umbraco.Web.Common.ActionResults; namespace Umbraco.Web.BackOffice.Filters { @@ -20,33 +21,15 @@ namespace Umbraco.Web.BackOffice.Filters if (context.Result is JavaScriptResult jsResult) { - - var result = jsResult.Content; var minified = await runtimeMinifier.MinifyAsync(result, AssetType.Javascript); jsResult.Content = minified; } } - - - - await next(); // the actual action // logic after the action goes here } - - public override void OnResultExecuting(ResultExecutingContext context) - { - base.OnResultExecuting(context); - - - - - - //minify the result - - } } }