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

Changed IPublishedContentStore and IPublishedMediaStore back to internal as we don't need to expose these yet. Instead have added

Browse Source 
an UmbracoHelper property to the PluginController class which will expose any methods needed by devs to retreive media or content.
Have updated UmbracoHelper with loads of new helpful methods and moved the Wrap methods to HtmlHelper extensions because this is purely to
do with rendering html (have written unit tests for it too).
Updated some 'library' methods to proxy calls to UmbracoHelper so we only have to maintain one set of code.
Added a convenience property to UmbracoContext to return the current NiceUrlProvider so you don't have to go through the RoutingContext to get it.
This commit is contained in:
Shannon Deminick
2012-09-27 08:30:35 +07:00
parent 530e7ae44e
commit f7f83bc057
14 changed files with 447 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using Umbraco.Core.Dynamics;
using Umbraco.Web;
using umbraco.interfaces;
@@ -17,6 +18,12 @@ namespace umbraco.MacroEngines.Library
{
private readonly INode _node;
private readonly UmbracoHelper _umbracoHelper;
/// <summary>
/// An empty HtmlHelper with a blank ViewContext, used only to access some htmlHelper extension methods
/// </summary>
private readonly HtmlHelper _htmlHelper;
public INode Node
{
get { return _node; }
@@ -25,6 +32,7 @@ namespace umbraco.MacroEngines.Library
{
this._node = node;
_umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
_htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
}
public dynamic NodeById(int Id)
@@ -194,24 +202,24 @@ namespace umbraco.MacroEngines.Library
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(string tag, string innerText, params Umbraco.Web.Mvc.IHtmlTagWrapper[] children)
{
return _umbracoHelper.Wrap(tag, innerText, children);
{
return _htmlHelper.Wrap(tag, innerText, children);
}
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);
return _htmlHelper.Wrap(tag, inner, anonymousAttributes, children);
}
public Umbraco.Web.Mvc.HtmlTagWrapper Wrap(string tag, object inner)
{
return _umbracoHelper.Wrap(tag, inner);
return _htmlHelper.Wrap(tag, inner);
}
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);
return _htmlHelper.Wrap(tag, innerText, anonymousAttributes, children);
}
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);
return _htmlHelper.Wrap(visible, tag, innerText, anonymousAttributes, children);
}
public IHtmlString Truncate(IHtmlString html, int length)