aboutsummaryrefslogtreecommitdiffstats
path: root/docs/components
diff options
context:
space:
mode:
authorMatias Niemelä2013-07-08 21:58:14 -0400
committerIgor Minar2013-07-26 08:51:38 -0700
commit258cae83dc1a03b6b878a7b4236c499288cd2624 (patch)
treee793480d3d237ba10e31203a67e67ef93b47c00a /docs/components
parentab189142988043d0513bb796c3b54ca7d07f242d (diff)
downloadangular.js-258cae83dc1a03b6b878a7b4236c499288cd2624.tar.bz2
chore(ngdocs): replace showdown.js with marked.js
Diffstat (limited to 'docs/components')
-rw-r--r--docs/components/angular-bootstrap/bootstrap.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/docs/components/angular-bootstrap/bootstrap.js b/docs/components/angular-bootstrap/bootstrap.js
index 71972200..170e8805 100644
--- a/docs/components/angular-bootstrap/bootstrap.js
+++ b/docs/components/angular-bootstrap/bootstrap.js
@@ -257,7 +257,7 @@ var popoverElement = function() {
content : function(value) {
if(value && value.length > 0) {
- value = new Showdown.converter().makeHtml(value);
+ value = marked(value);
}
return this.contentElement.html(value);
},
@@ -380,4 +380,12 @@ directive.foldout = ['$http', '$animator','$window', function($http, $animator,
}
}];
-angular.module('bootstrap', []).directive(directive).factory('popoverElement', popoverElement);
+angular.module('bootstrap', [])
+ .directive(directive)
+ .factory('popoverElement', popoverElement)
+ .run(function() {
+ marked.setOptions({
+ gfm: true,
+ tables: true
+ });
+ });