diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/publishedcontent.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/publishedcontent.resource.js index 82977020a4..9956ebf723 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/publishedcontent.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/publishedcontent.resource.js @@ -7,6 +7,8 @@ **/ function publishedContentResource($q, $http, umbRequestHelper) { + //TODO: Why do we have this ? If we want a URL why isn't it just on the content controller ? + //the factory object returned return { diff --git a/src/Umbraco.Web/Editors/PublishedContentController.cs b/src/Umbraco.Web/Editors/PublishedContentController.cs index bd1325aa33..4527f12994 100644 --- a/src/Umbraco.Web/Editors/PublishedContentController.cs +++ b/src/Umbraco.Web/Editors/PublishedContentController.cs @@ -7,13 +7,16 @@ using Umbraco.Web.Mvc; namespace Umbraco.Web.Editors { + + //TODO: Why do we have this ? If we want a URL why isn't it just on the content controller ? + [PluginController("UmbracoApi")] public class PublishedContentController : UmbracoAuthorizedJsonController { - UmbracoHelper helper = new UmbracoHelper(UmbracoContext.Current); + public string GetNiceUrl(int id) { - return helper.NiceUrl(id); + return Umbraco.NiceUrl(id); } } } diff --git a/src/Umbraco.Web/Models/ContentEditing/RichTextEditorCommand.cs b/src/Umbraco.Web/Models/ContentEditing/RichTextEditorCommand.cs index 646046ae56..cbfeedd86e 100644 --- a/src/Umbraco.Web/Models/ContentEditing/RichTextEditorCommand.cs +++ b/src/Umbraco.Web/Models/ContentEditing/RichTextEditorCommand.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.Models.ContentEditing public string UserInterface { get; set; } [DataMember(Name = "frontEndCommand")] - public string FrontendCommand { get; set; } + public string FrontEndCommand { get; set; } [DataMember(Name = "value")] public string Value { get; set; } diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs b/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs index 33f8b61cb6..75759cba54 100644 --- a/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs +++ b/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs @@ -69,7 +69,7 @@ namespace Umbraco.Web.PropertyEditors Command = n.SelectSingleNode("./tinyMceCommand").FirstChild.Value, Alias = n.SelectSingleNode("./umbracoAlias").FirstChild.Value.ToLower(), UserInterface = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("userInterface").Value, - FrontendCommand = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("frontendCommand").Value, + FrontEndCommand = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("frontendCommand").Value, Value = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("value").Value, Priority = int.Parse(n.SelectSingleNode("./priority").FirstChild.Value) }