mirror/reveal.js
1
0
Fork 0
mirror of https://github.com/hakimel/reveal.js.git synced 2025-08-20 05:21:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'markdown-in-notes' of https://github.com/technicalpickles/reveal.js

Browse Source
This commit is contained in:
Hakim El Hattab
2012-09-21 09:01:08 -04:00
parent c904cef864 df2ebc570c
commit c5fe9bd3c4
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/speakernotes/client.js
View File

@@ -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);

9
plugin/speakernotes/notes.html
View File

@@ -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);
});