xobs/fossasia-22-renode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server

Browse Source 
Conflicts:
	js/reveal.min.js

Need to generate a new minified version afterwards.
This commit is contained in:
Michael Kühnel
2012-10-24 17:48:50 +02:00
parent aefe981040 379f5d38ff
commit 5af915adaf
6 changed files with 50 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugin/notes-server/notes.html
View File

@ -112,17 +112,28 @@
// ignore data from sockets that aren't ours
if (data.socketId !== socketId) { return; }
if (data.markdown) {
notes.innerHTML = (new Showdown.converter()).makeHtml(data.notes);
}
else {
notes.innerHTML = data.notes;
}
if (data.markdown) {
notes.innerHTML = (new Showdown.converter()).makeHtml(data.notes);
}
else {
notes.innerHTML = data.notes;
}
currentSlide.contentWindow.Reveal.slide(data.indexh, data.indexv);
nextSlide.contentWindow.Reveal.slide(data.nextindexh, data.nextindexv);
});
socket.on('fragmentdata', function(data) {
// ignore data from sockets that aren't ours
if (data.socketId !== socketId) { return; }
if (data.fragment === 'next') {
currentSlide.contentWindow.Reveal.nextFragment();
}
else if (data.fragment === 'previous') {
currentSlide.contentWindow.Reveal.prevFragment();
}
});
</script>
</body>
</html>
</html>