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

Merge branch 'markdowneditor-fix' of git://github.com/pynej/Umbraco-CMS into pynej-markdowneditor-fix

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
This commit is contained in:
Simon Busborg
2016-01-19 12:18:24 +01:00
parent a6b7e26606 9dbdae3b90
commit 853bd3947b
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
View File

@@ -1,5 +1,5 @@
//inject umbracos assetsServce and dialog service
function MarkdownEditorController($scope, assetsService, dialogService, $timeout) {
function MarkdownEditorController($scope, $element, assetsService, dialogService, angularHelper, $timeout) {
//tell the assets service to load the markdown.editor libs from the markdown editors
//plugin folder
@@ -42,7 +42,7 @@ function MarkdownEditorController($scope, assetsService, dialogService, $timeout
// we need a short delay to wait for the textbox to appear.
setTimeout(function () {
//this function will execute when all dependencies have loaded
// but in the case that they've been previously loaded, we can only
// but in the case that they've been previously loaded, we can only
// init the md editor after this digest because the DOM needs to be ready first
// so run the init on a timeout
$timeout(function () {
@@ -56,6 +56,12 @@ function MarkdownEditorController($scope, assetsService, dialogService, $timeout
return true; // tell the editor that we'll take care of getting the image url
});
editor2.hooks.set("onPreviewRefresh", function () {
angularHelper.getCurrentForm($scope).$setDirty();
// We must manually update the model as there is no way to hook into the markdown editor events without editing that code.
$scope.model.value = $("textarea", $element).val();
});
}, 200);
});

8
src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
View File

@@ -1,4 +1,5 @@
using System;
using MarkdownSharp;
using System;
using System.Web;
using Umbraco.Core;
using Umbraco.Core.Models.PublishedContent;
@@ -31,8 +32,11 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
public override object ConvertSourceToObject(PublishedPropertyType propertyType, object source, bool preview)
{
// Convert markup to html for frontend rendering.
Markdown mark = new Markdown();
// source should come from ConvertSource and be a string (or null) already
return new HtmlString(source == null ? string.Empty : (string)source);
return new HtmlString(source == null ? string.Empty : mark.Transform((string)source));
}
public override object ConvertSourceToXPath(PublishedPropertyType propertyType, object source, bool preview)

4
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -132,6 +132,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="MarkdownSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Markdown.1.14.4\lib\net45\MarkdownSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>

1
src/Umbraco.Web/packages.config
View File

@@ -6,6 +6,7 @@
<package id="Examine" version="0.1.68.0" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Markdown" version="1.14.4" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />