diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
index 80cfad824d..ef8a9f24d1 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
@@ -58,11 +58,6 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
///
UrlEncoder UrlEncoder { get; }
- ///
- /// Gets the to be used for encoding JavaScript.
- ///
- JavaScriptEncoder JavaScriptEncoder { get; }
-
///
/// Returns an anchor (<a>) element that contains a URL path to the specified action.
///
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
index c58818e996..1d86236cc5 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
@@ -10,7 +10,6 @@ using System.Text.Encodings.Web;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewEngines;
using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
@@ -46,8 +45,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
IModelMetadataProvider metadataProvider,
IViewBufferScope bufferScope,
HtmlEncoder htmlEncoder,
- UrlEncoder urlEncoder,
- JavaScriptEncoder javaScriptEncoder)
+ UrlEncoder urlEncoder)
{
if (htmlGenerator == null)
{
@@ -79,18 +77,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
throw new ArgumentNullException(nameof(urlEncoder));
}
- if (javaScriptEncoder == null)
- {
- throw new ArgumentNullException(nameof(javaScriptEncoder));
- }
-
_viewEngine = viewEngine;
_htmlGenerator = htmlGenerator;
_htmlEncoder = htmlEncoder;
_bufferScope = bufferScope;
MetadataProvider = metadataProvider;
UrlEncoder = urlEncoder;
- JavaScriptEncoder = javaScriptEncoder;
}
///
@@ -163,9 +155,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
///
public UrlEncoder UrlEncoder { get; }
- ///
- public JavaScriptEncoder JavaScriptEncoder { get; }
-
///
public IModelMetadataProvider MetadataProvider { get; }
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs
index ec62e82b32..a059d28ae5 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs
@@ -24,16 +24,14 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
IModelMetadataProvider metadataProvider,
IViewBufferScope bufferScope,
HtmlEncoder htmlEncoder,
- UrlEncoder urlEncoder,
- JavaScriptEncoder javaScriptEncoder)
+ UrlEncoder urlEncoder)
: base(
htmlGenerator,
viewEngine,
metadataProvider,
bufferScope,
htmlEncoder,
- urlEncoder,
- javaScriptEncoder)
+ urlEncoder)
{
}
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs
index 5583d3571e..aa7c8a547c 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs
@@ -12,11 +12,9 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.TestCommon;
using Microsoft.AspNetCore.Mvc.ViewEngines;
-using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
using Microsoft.AspNetCore.Testing;
using Moq;
using Xunit;
@@ -969,11 +967,6 @@ Environment.NewLine;
get { return _innerHelper.UrlEncoder; }
}
- public JavaScriptEncoder JavaScriptEncoder
- {
- get { return _innerHelper.JavaScriptEncoder; }
- }
-
public void Contextualize(ViewContext viewContext)
{
(_innerHelper as ICanHasViewContext)?.Contextualize(viewContext);
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
index a12aa2558b..8f3d5148c0 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
@@ -261,8 +261,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
provider,
new TestViewBufferScope(),
new HtmlTestEncoder(),
- UrlEncoder.Default,
- JavaScriptEncoder.Default);
+ UrlEncoder.Default);
if (innerHelperWrapper != null)
{
@@ -285,8 +284,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
provider,
new TestViewBufferScope(),
new HtmlTestEncoder(),
- UrlEncoder.Default,
- JavaScriptEncoder.Default);
+ UrlEncoder.Default);
var viewContext = new ViewContext(
actionContext,
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
index dd9e4350db..f9cf3b33f1 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
@@ -1570,8 +1570,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
metadataProvider,
new TestViewBufferScope(),
new Mock(MockBehavior.Strict).Object,
- new Mock(MockBehavior.Strict).Object,
- new Mock(MockBehavior.Strict).Object)
+ new Mock(MockBehavior.Strict).Object)
{
}