From da8c5f3e58e25ca556a2795eb442f516d7a57542 Mon Sep 17 00:00:00 2001 From: Mike Bild Date: Thu, 18 Sep 2014 09:40:09 +0200 Subject: [PATCH 1/2] Update markdown.js Markdown + HTML output support using $sce.trustAsHtml --- markdown.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown.js b/markdown.js index 08f2248..c24ca83 100644 --- a/markdown.js +++ b/markdown.js @@ -18,17 +18,17 @@ angular.module('btford.markdown', ['ngSanitize']). } }; }). - directive('btfMarkdown', function ($sanitize, markdownConverter) { + directive('btfMarkdown', function ($sce, markdownConverter) { return { restrict: 'AE', link: function (scope, element, attrs) { if (attrs.btfMarkdown) { scope.$watch(attrs.btfMarkdown, function (newVal) { - var html = newVal ? $sanitize(markdownConverter.makeHtml(newVal)) : ''; + var html = newVal ? $sce.trustAsHtml(markdownConverter.makeHtml(newVal)) : ''; element.html(html); }); } else { - var html = $sanitize(markdownConverter.makeHtml(element.text())); + var html = $sce.trustAsHtml(markdownConverter.makeHtml(element.text())); element.html(html); } } From bc2755372c7e7b15d48ffc26aa328add00fb948d Mon Sep 17 00:00:00 2001 From: Mike Bild Date: Thu, 18 Sep 2014 13:16:33 +0200 Subject: [PATCH 2/2] Update markdown.js html output support --- markdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown.js b/markdown.js index c24ca83..65c7881 100644 --- a/markdown.js +++ b/markdown.js @@ -28,7 +28,7 @@ angular.module('btford.markdown', ['ngSanitize']). element.html(html); }); } else { - var html = $sce.trustAsHtml(markdownConverter.makeHtml(element.text())); + var html = $sce.trustAsHtml(markdownConverter.makeHtml(element.html())); element.html(html); } }