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

Fixes: U4-5443 Unable to add images using markdown editor, U4-5442 Markdown editor breaks on navigation

Browse Source
This commit is contained in:
Shannon
2014-10-02 13:18:35 +10:00
parent 613dd76f81
commit 3400c52e45
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
angular.module("umbraco")
.controller("Umbraco.PropertyEditors.MarkdownEditorController",
//inject umbracos assetsServce and dialog service
function ($scope, assetsService, dialogService, $log, imageHelper) {
function ($scope, assetsService, dialogService, $timeout) {
//tell the assets service to load the markdown.editor libs from the markdown editors
//plugin folder
@@ -17,23 +17,28 @@ function ($scope, assetsService, dialogService, $log, imageHelper) {
"lib/markdown/markdown.editor.js"
])
.then(function () {
//this function will execute when all dependencies have loaded
var converter2 = new Markdown.Converter();
var editor2 = new Markdown.Editor(converter2, "-" + $scope.model.alias);
editor2.run();
// 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() {
var converter2 = new Markdown.Converter();
var editor2 = new Markdown.Editor(converter2, "-" + $scope.model.alias);
editor2.run();
//subscribe to the image dialog clicks
editor2.hooks.set("insertImageDialog", function (callback) {
//subscribe to the image dialog clicks
editor2.hooks.set("insertImageDialog", function (callback) {
dialogService.mediaPicker({ callback: function (data) {
callback(data.url);
}
});
return true; // tell the editor that we'll take care of getting the image url
});
dialogService.mediaPicker({
callback: function (data) {
callback(data.image);
}
});
return true; // tell the editor that we'll take care of getting the image url
});
});
});
//load the seperat css for the editor to avoid it blocking our js loading TEMP HACK

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
View File

@@ -1,7 +1,7 @@
<div ng-controller="Umbraco.PropertyEditors.MarkdownEditorController" class="wmd-panel">
<div id="wmd-button-bar-{{model.alias}}"></div>
<textarea ng-model="model.value" class="wmd-input" id="wmd-input-{{model.alias}}"></textarea>
</div>
<textarea ng-model="model.value" class="wmd-input" id="wmd-input-{{model.alias}}"></textarea>
<div ng-show="model.config.preview" id="wmd-preview-{{model.alias}}" class="wmd-panel wmd-preview"></div>
</div>