aboutsummaryrefslogtreecommitdiff
path: root/plugin/markdown
diff options
context:
space:
mode:
authorRiceball LEE <snowyu.lee@gmail.com>2013-07-31 06:48:09 +0800
committerRiceball LEE <snowyu.lee@gmail.com>2013-07-31 07:12:29 +0800
commitefbcab57f74891a060320af1c9e2e3c039febc5a (patch)
treedc4ebb2465ef25463f98bfd0ea3083f9d5f8457b /plugin/markdown
parent7d19b4f7ce2ab3fd7880d0f60b1c147d44808f0c (diff)
downloadfosdem-2018-presentation-efbcab57f74891a060320af1c9e2e3c039febc5a.tar
fosdem-2018-presentation-efbcab57f74891a060320af1c9e2e3c039febc5a.tar.gz
* [bug] fixed render markdown file error like this:
```html <section data-markdown> <script type="text/template"> </script> </section> ```
Diffstat (limited to 'plugin/markdown')
-rwxr-xr-xplugin/markdown/markdown.js16
1 files changed, 12 insertions, 4 deletions
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 473666b..dcab2fa 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -6,6 +6,14 @@
throw 'The reveal.js Markdown plugin requires marked to be loaded';
}
+ if (typeof hljs !== 'undefined') {
+ marked.setOptions({
+ highlight: function (lang, code) {
+ return hljs.highlightAuto(lang, code).value;
+ }
+ });
+ }
+
var stripLeadingWhitespace = function(section) {
var template = section.querySelector( 'script' );
@@ -28,7 +36,7 @@
};
var twrap = function(el) {
- return '<script type="text/template">' + el + '</script>';
+ return marked(el);
};
var getForwardedAttributes = function(section) {
@@ -51,7 +59,7 @@
}
return result.join( ' ' );
- }
+ };
var slidifyMarkdown = function(markdown, separator, vertical, attributes) {
@@ -101,12 +109,12 @@
for( var k = 0, klen = sectionStack.length; k < klen; k++ ) {
// horizontal
if( typeof sectionStack[k] === 'string' ) {
- markdownSections += '<section '+ attributes +' data-markdown>' + twrap( sectionStack[k] ) + '</section>';
+ markdownSections += '<section '+ attributes +'>' + twrap( sectionStack[k] ) + '</section>';
}
// vertical
else {
markdownSections += '<section '+ attributes +'>' +
- '<section data-markdown>' + sectionStack[k].map(twrap).join('</section><section data-markdown>') + '</section>' +
+ '<section>' + sectionStack[k].map(twrap).join('</section><section>') + '</section>' +
'</section>';
}
}