Merge branch 'bug/markdownSetOptions' of https://github.com/snowyu/reveal.js into dev

2016-06-22 09:20:24 +02:00
parent 8d4cb810d6 16ebf2a783
commit 8d7ff10ce3
5 changed files with 68 additions and 3 deletions
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -23,8 +23,8 @@

 	if( typeof hljs !== 'undefined' ) {
 		marked.setOptions({
-			highlight: function( lang, code ) {
-				return hljs.highlightAuto( lang, code ).value;
+			highlight: function( code, lang ) {
+				return hljs.highlightAuto( code, [lang] ).value;
 			}
 		});
 	}
--- a/plugin/markdown/marked.js
+++ b/plugin/markdown/marked.js