Changing to the new types and referencing the abstraction methods

This commit is contained in:
Elitsa Marinovska
2020-03-17 10:35:06 +01:00
parent 4b7d823aca
commit da24b03b3b
7 changed files with 52 additions and 61 deletions

View File

@@ -1,9 +1,7 @@
using System.Web.Mvc;
using System.Web.UI;
using ClientDependency.Core;
using ClientDependency.Core.CompositeFiles;
using Umbraco.Composing;
using Umbraco.Web.Composing;
using Umbraco.Core.Hosting;
using Umbraco.Core.Runtime;
namespace Umbraco.Web.Mvc
{
@@ -16,15 +14,18 @@ namespace Umbraco.Web.Mvc
public class MinifyJavaScriptResultAttribute : ActionFilterAttribute
{
private readonly IHostingEnvironment _hostingEnvironment;
private readonly IRuntimeMinifier _runtimeMinifier;
public MinifyJavaScriptResultAttribute()
{
_hostingEnvironment = Current.HostingEnvironment;
_runtimeMinifier = Current.RuntimeMinifier;
}
public MinifyJavaScriptResultAttribute(IHostingEnvironment hostingEnvironment)
public MinifyJavaScriptResultAttribute(IHostingEnvironment hostingEnvironment, IRuntimeMinifier runtimeMinifier)
{
_hostingEnvironment = hostingEnvironment;
_runtimeMinifier = runtimeMinifier;
}
/// <summary>
@@ -42,10 +43,8 @@ namespace Umbraco.Web.Mvc
//minify the result
var result = jsResult.Script;
var minifier = new JSMin();
var minified = minifier.Minify(result);
var minified = _runtimeMinifier.Minify(result);
jsResult.Script = minified;
}
}
}