xobs/lca20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hakim El Hattab
2016-06-22 09:20:24 +02:00
parent 8d4cb810d6 16ebf2a783
commit 8d7ff10ce3
5 changed files with 68 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/markdown/markdown.js
View File

@@ -23,8 +23,8 @@
if( typeof hljs !== 'undefined' ) { if( typeof hljs !== 'undefined' ) {
marked.setOptions({ marked.setOptions({
highlight: function( lang, code ) { highlight: function( code, lang ) {
return hljs.highlightAuto( lang, code ).value; return hljs.highlightAuto( code, [lang] ).value;
} }
}); });
} }

2
plugin/markdown/marked.js
View File

File diff suppressed because one or more lines are too long

10
test/simple.md Normal file
View File

@@ -0,0 +1,10 @@
## Slide 1.1
```js
var a = 1;
```
## Slide 1.2
## Slide 2

36
test/test-markdown-external.html Normal file
View File

@@ -0,0 +1,36 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>reveal.js - Test Markdown</title>
<link rel="stylesheet" href="../css/reveal.css">
<link rel="stylesheet" href="qunit-1.12.0.css">
</head>
<body style="overflow: auto;">
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<div class="reveal" style="display: none;">
<div class="slides">
<section data-markdown="simple.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section>
</div>
</div>
<script src="../lib/js/head.min.js"></script>
<script src="../js/reveal.js"></script>
<script src="../plugin/highlight/highlight.js"></script>
<script src="../plugin/markdown/marked.js"></script>
<script src="../plugin/markdown/markdown.js"></script>
<script src="qunit-1.12.0.js"></script>
<script src="test-markdown-external.js"></script>
</body>
</html>

19
test/test-markdown-external.js Normal file
View File

@@ -0,0 +1,19 @@
Reveal.addEventListener( 'ready', function() {
QUnit.module( 'Markdown' );
test( 'Vertical separator', function() {
strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' );
});
test( 'language highlighter', function() {
strictEqual( document.querySelectorAll( '.hljs-keyword' ).length, 1, 'got rendered highlight tag.' );
strictEqual( document.querySelector( '.hljs-keyword' ).innerHTML, 'var', 'the same keyword: var.' );
});
} );
Reveal.initialize();