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

replaces scriptLoader references with assetsService

Browse Source
This commit is contained in:
Per Ploug Krogslund
2013-08-05 13:04:24 +02:00
parent 31aa7a4ff9
commit 319da4816a
15 changed files with 243 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js
View File

@@ -1,23 +1,23 @@
angular.module("umbraco")
.controller("My.MarkdownEditorController",
//inject umbracos scriptLoader
function ($scope,scriptLoader) {
//inject umbracos assetsServce
function ($scope,assetsService) {
//tell the scriptloader to load the markdown.editor libs from the markdown editors
//tell the assets service to load the markdown.editor libs from the markdown editors
//plugin folder
scriptLoader
assetsService
.load([
"/app_plugins/markdowneditor/lib/markdown.converter.js",
"/app_plugins/markdowneditor/lib/markdown.sanitizer.js",
"/app_plugins/markdowneditor/lib/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);
//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();
});
//load the seperat css for the editor to avoid it blocking our js loading TEMP HACK
scriptLoader.load(["/app_plugins/markdowneditor/lib/markdown.css"]);
assetsService.loadCss("/app_plugins/markdowneditor/lib/markdown.css");
});