From 9317b104440362c07e3850fa1d73a5bfe79e4377 Mon Sep 17 00:00:00 2001 From: Victor Pegado Date: Tue, 17 Mar 2015 09:53:30 +0100 Subject: [PATCH 1/4] Remove $sce parts This should be taken care of on an application level. If you need to support something extra please do with the $compileProvider: https://docs.angularjs.org/api/ng/provider/$compileProvider --- markdown.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/markdown.js b/markdown.js index 70c23b0..4dc61d6 100644 --- a/markdown.js +++ b/markdown.js @@ -10,10 +10,9 @@ angular.module('markdown', []) } }; }) - .filter('markdown', ['$sce', 'markdown', function ($sce, markdown) { + .filter('markdown', ['$sce', 'markdown', function (markdown) { return function (text) { - if(text == null) text = ''; - var html = markdown.makeHtml(text); - return $sce.trustAsHtml(html); + text = text || ''; + return markdown.makeHtml(text); }; }]); From 7c5134bd1fd97d1d2aaa3d9aa19c4852f1684482 Mon Sep 17 00:00:00 2001 From: Victor Pegado Date: Tue, 17 Mar 2015 10:02:12 +0100 Subject: [PATCH 2/4] Update markdown.js --- markdown.js | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/markdown.js b/markdown.js index 4dc61d6..e64398f 100644 --- a/markdown.js +++ b/markdown.js @@ -1,18 +1,19 @@ +'use strict'; + angular.module('markdown', []) - .provider('markdown', function () { - var opts = {}; - return { - config: function (newOpts) { - opts = newOpts; - }, - $get: function () { - return new Showdown.converter(opts); - } - }; - }) - .filter('markdown', ['$sce', 'markdown', function (markdown) { - return function (text) { - text = text || ''; - return markdown.makeHtml(text); - }; - }]); + .provider('markdown', [function () { + var opts = {}; + return { + config: function (newOpts) { + opts = newOpts; + }, + $get: function () { + return new window.Showdown.converter(opts); + } + }; + }]) + .filter('markdown', ['markdown', function (markdown) { + return function (text) { + return markdown.makeHtml(text || ''); + }; + }]); From e7849d3488671a25ecb570955ed7fc9288027743 Mon Sep 17 00:00:00 2001 From: Victor Pegado Date: Tue, 17 Mar 2015 10:08:50 +0100 Subject: [PATCH 3/4] Update README.md --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3b1ab36..28443b1 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ $ bower install angular-markdown-filter ## Import dependencies ```html - - + + ``` ```javascript angular.module('myApp', [ @@ -35,8 +35,12 @@ for details on how to create extensions. ## Usage ```javascript angular.module('myApp') + .config(function ($compileProvider) { + // Add optional support for custom schema links: "herp://" and "derp://" + $compileProvider.aHrefSanitizationWhitelist(/^\s*(herp|derp):/); + }) .controller('MainCtrl', function ($scope) { - $scope.text = '# Heading 1'; + $scope.text = '# Heading 1\n- [Link](http://example.com)\n- [Custom Link 1](herp://is.this.working?)\n- [Custom Link 2](derp://is.this.working?)'; }); ``` ```html From ca966d301833edbf028151aa9c9bbad8859e522a Mon Sep 17 00:00:00 2001 From: Victor Pegado Date: Tue, 17 Mar 2015 10:11:36 +0100 Subject: [PATCH 4/4] Update bower.json --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index eea5029..ec03515 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-markdown-filter", - "version": "1.1.0", + "version": "1.2.0", "main": "markdown.js", "keywords": [ "angular",