Skip to content

Commit

Permalink
Merge pull request #6 from vpegado/fix-sanitize
Browse files Browse the repository at this point in the history
Fix ngSantize issue #5
  • Loading branch information
vpegado committed Mar 17, 2015
2 parents df2c55a + ca966d3 commit e04d52c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 22 deletions.
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ $ bower install angular-markdown-filter

## Import dependencies
```html
<script src="/bower_components/showdown/compressed/showdown.js"></script>
<script src="/bower_components/angular-markdown-filter/markdown.js"></script>
<script src="bower_components/showdown/compressed/showdown.js"></script>
<script src="bower_components/angular-markdown-filter/markdown.js"></script>
```
```javascript
angular.module('myApp', [
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-markdown-filter",
"version": "1.1.0",
"version": "1.2.0",
"main": "markdown.js",
"keywords": [
"angular",
Expand Down
36 changes: 18 additions & 18 deletions markdown.js
Original file line number Diff line number Diff line change
@@ -1,19 +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 ($sce, markdown) {
return function (text) {
if(text == null) text = '';
var html = markdown.makeHtml(text);
return $sce.trustAsHtml(html);
};
}]);
.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 || '');
};
}]);

0 comments on commit e04d52c

Please sign in to comment.