diff options
| author | Hakim El Hattab | 2012-09-21 09:01:08 -0400 |
|---|---|---|
| committer | Hakim El Hattab | 2012-09-21 09:01:08 -0400 |
| commit | c5fe9bd3c4569091acbcd0b69425a39a994bdc47 (patch) | |
| tree | 1120c58314987f2979f449b39d5d3e0c11a4afa3 /plugin | |
| parent | c904cef8649310a4c37d53420be3fdc186fedc4f (diff) | |
| parent | df2ebc570ce921b2d83883dd6dca03f6cd81b6af (diff) | |
Merge branch 'markdown-in-notes' of https://github.com/technicalpickles/reveal.js
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/speakernotes/client.js | 4 | ||||
| -rw-r--r-- | plugin/speakernotes/notes.html | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/plugin/speakernotes/client.js b/plugin/speakernotes/client.js index b164a56..20f8e2f 100644 --- a/plugin/speakernotes/client.js +++ b/plugin/speakernotes/client.js @@ -28,7 +28,9 @@ indexv : event.indexv, nextindexh : nextindexh, nextindexv : nextindexv, - socketId : socketId + socketId : socketId, + markdown : notes ? notes.getAttribute('data-markdown') != null : false + }; socket.emit('slidechanged', slideData); diff --git a/plugin/speakernotes/notes.html b/plugin/speakernotes/notes.html index 88924c0..f61501d 100644 --- a/plugin/speakernotes/notes.html +++ b/plugin/speakernotes/notes.html @@ -87,6 +87,7 @@ <div id="notes"></div> <script src="/socket.io/socket.io.js"></script> + <script src="/lib/js/showdown.js"></script> <script> var socketId = '{{socketId}}'; @@ -99,7 +100,13 @@ // ignore data from sockets that aren't ours if (data.socketId !== socketId) { return; } - notes.innerHTML = data.notes; + if (data.markdown) { + notes.innerHTML = (new Showdown.converter()).makeHtml(data.notes); + } + else { + notes.innerHTML = data.notes; + } + currentSlide.contentWindow.Reveal.navigateTo(data.indexh, data.indexv); nextSlide.contentWindow.Reveal.navigateTo(data.nextindexh, data.nextindexv); }); |