yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed erroneous Wrap methods that were hidden by other overloads based on optional parameters.

Browse Source
This commit is contained in:
Shannon Deminick
2012-09-20 13:32:08 +07:00
parent ae4cb00bbc
commit fa36ff3662
2 changed files with 3 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -655,20 +655,7 @@ namespace Umbraco.Web
item.AddChild(child);
}
return item;
}
public HtmlTagWrapper Wrap(string tag, string innerText)
{
return Wrap(tag, innerText, (object)null);
}
public HtmlTagWrapper Wrap(string tag, object inner, object anonymousAttributes)
{
string innerText = null;
if (inner != null && inner.GetType() != typeof(DynamicNull))
{
innerText = string.Format("{0}", inner);
}
return Wrap(tag, innerText, anonymousAttributes);
}
}
public HtmlTagWrapper Wrap(string tag, object inner, object anonymousAttributes, params IHtmlTagWrapper[] children)
{
@@ -691,21 +678,9 @@ namespace Umbraco.Web
{
innerText = string.Format("{0}", inner);
}
return Wrap(tag, innerText, null);
}
public HtmlTagWrapper Wrap(string tag, string innerText, object anonymousAttributes)
{
var wrap = new HtmlTagWrapper(tag);
if (anonymousAttributes != null)
{
wrap.ReflectAttributesFromAnonymousType(anonymousAttributes);
}
if (!string.IsNullOrWhiteSpace(innerText))
{
wrap.AddChild(new HtmlTagWrapperTextNode(innerText));
}
return wrap;
return Wrap(tag, innerText, (object)null);
}
public HtmlTagWrapper Wrap(string tag, string innerText, object anonymousAttributes, params IHtmlTagWrapper[] children)
{
var wrap = new HtmlTagWrapper(tag);
@@ -724,12 +699,6 @@ namespace Umbraco.Web
return wrap;
}
public HtmlTagWrapper Wrap(bool visible, string tag, string innerText, object anonymousAttributes)
{
var item = Wrap(tag, innerText, anonymousAttributes);
item.Visible = visible;
return item;
}
public HtmlTagWrapper Wrap(bool visible, string tag, string innerText, object anonymousAttributes, params IHtmlTagWrapper[] children)
{
var item = Wrap(tag, innerText, anonymousAttributes, children);

16
src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs
View File

@@ -197,14 +197,6 @@ namespace umbraco.MacroEngines.Library
{
return _umbracoHelper.Wrap(tag, innerText, children);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(string tag, string innerText)
{
return Wrap(tag, innerText, (object)null);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(string tag, object inner, object anonymousAttributes)
{
return _umbracoHelper.Wrap(tag, inner, anonymousAttributes);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(string tag, object inner, object anonymousAttributes, params Umbraco.Web.Mvc.IHtmlTagWrapper[] children)
{
return _umbracoHelper.Wrap(tag, inner, anonymousAttributes, children);
@@ -213,18 +205,10 @@ namespace umbraco.MacroEngines.Library
{
return _umbracoHelper.Wrap(tag, inner);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(string tag, string innerText, object anonymousAttributes)
{
return _umbracoHelper.Wrap(tag, innerText, anonymousAttributes);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(string tag, string innerText, object anonymousAttributes, params Umbraco.Web.Mvc.IHtmlTagWrapper[] children)
{
return _umbracoHelper.Wrap(tag, innerText, anonymousAttributes, children);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(bool visible, string tag, string innerText, object anonymousAttributes)
{
return _umbracoHelper.Wrap(visible, tag, innerText, anonymousAttributes);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(bool visible, string tag, string innerText, object anonymousAttributes, params Umbraco.Web.Mvc.IHtmlTagWrapper[] children)
{
return _umbracoHelper.Wrap(visible, tag, innerText, anonymousAttributes, children);