huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed JavaScriptEncoder property from HtmlHelper

This commit is contained in:
Kiran Challa 2016-02-02 13:53:24 -08:00
parent d97fe04cd7
commit bf93c7d7a4
6 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
View File

@ -58,11 +58,6 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
/// </summary>
UrlEncoder UrlEncoder { get; }
/// <summary>
/// Gets the <see cref="JavaScriptEncoder"/> to be used for encoding JavaScript.
/// </summary>
JavaScriptEncoder JavaScriptEncoder { get; }
/// <summary>
/// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
/// </summary>

13
src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
View File

@ -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;
}
/// <inheritdoc />
@ -163,9 +155,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
/// <inheritdoc />
public UrlEncoder UrlEncoder { get; }
/// <inheritdoc />
public JavaScriptEncoder JavaScriptEncoder { get; }
/// <inheritdoc />
public IModelMetadataProvider MetadataProvider { get; }

6
src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs
View File

@ -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)
{
}

7
test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs
View File

@ -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);

6
test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
View File

@ -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,

3
test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
View File

@ -1570,8 +1570,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
metadataProvider,
new TestViewBufferScope(),
new Mock<HtmlEncoder>(MockBehavior.Strict).Object,
new Mock<UrlEncoder>(MockBehavior.Strict).Object,
new Mock<JavaScriptEncoder>(MockBehavior.Strict).Object)
new Mock<UrlEncoder>(MockBehavior.Strict).Object)
{
}