Browse Source

Fix circular dependency problem for tag helpers

pull/279/head
Halil İbrahim Kalkan 9 years ago
parent
commit
b0ef1489b4
  1. 5
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelper.cs
  2. 2
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs
  3. 10
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpValidationAttributeTagHelperService.cs
  4. 2
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/IAbpTagHelperService.cs

5
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelper.cs

@ -1,4 +1,5 @@
using System.Threading.Tasks; using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Threading; using Volo.Abp.Threading;
@ -21,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
protected AbpTagHelper(TService service) protected AbpTagHelper(TService service)
{ {
Service = service; Service = service;
Service.TagHelper = (TTagHelper)this; Service.As<AbpTagHelperService<TTagHelper>>().TagHelper = (TTagHelper)this;
} }
public override void Init(TagHelperContext context) public override void Init(TagHelperContext context)

2
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs

@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
{ {
protected const string FormGroupContents = "FormGroupContents"; protected const string FormGroupContents = "FormGroupContents";
public TTagHelper TagHelper { get; set; } public TTagHelper TagHelper { get; internal set; }
public virtual int Order { get; } public virtual int Order { get; }

10
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpValidationAttributeTagHelperService.cs

@ -1,12 +1,4 @@
using System; using Microsoft.AspNetCore.Razor.TagHelpers;
using System.Collections.Generic;
using System.Linq;
using System.Text.Encodings.Web;
using Localization.Resources.AbpUi;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Localization;
namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
{ {

2
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/IAbpTagHelperService.cs

@ -7,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
public interface IAbpTagHelperService<TTagHelper> : ITransientDependency public interface IAbpTagHelperService<TTagHelper> : ITransientDependency
where TTagHelper : TagHelper where TTagHelper : TagHelper
{ {
TTagHelper TagHelper { get; set; } TTagHelper TagHelper { get; }
int Order { get; } int Order { get; }

Loading…
Cancel
Save