mirror/reveal.js
1
0
Fork 0
mirror of https://github.com/hakimel/reveal.js.git synced 2025-08-11 09:04:51 +02:00
Code Issues 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

5
plugin/notes-server/index.js
View File

@@ -18,6 +18,9 @@ io.sockets.on('connection', function(socket) {
socket.on('slidechanged', function(slideData) {
socket.broadcast.emit('slidedata', slideData);
});
socket.on('fragmentchanged', function(fragmentData) {
socket.broadcast.emit('fragmentdata', fragmentData);
});
});
app.configure(function() {
@@ -52,4 +55,4 @@ var slidesLocation = "http://localhost" + ( opts.port ? ( ':' + opts.port ) : ''
console.log( brown + "reveal.js - Speaker Notes" + reset );
console.log( "1. Open the slides at " + green + slidesLocation + reset );
console.log( "2. Click on the link your JS console to go to the notes page" );
console.log( "3. Advance through your slides and your notes will advance automatically" );
console.log( "3. Advance through your slides and your notes will advance automatically" );