From cbdbfc07f49d883ffcd432eac53303933deafe42 Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Thu, 18 Oct 2012 23:55:06 +0200 Subject: Fix indentation --- plugin/speakernotes/notes.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugin') diff --git a/plugin/speakernotes/notes.html b/plugin/speakernotes/notes.html index 13f043d..c051879 100644 --- a/plugin/speakernotes/notes.html +++ b/plugin/speakernotes/notes.html @@ -112,12 +112,12 @@ // 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); -- cgit v1.2.3 From 409c0dfbcc889017813a526b21ffd0a42aa5e804 Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Thu, 18 Oct 2012 23:56:51 +0200 Subject: Add missing semicolon --- plugin/speakernotes/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugin') diff --git a/plugin/speakernotes/client.js b/plugin/speakernotes/client.js index ad1bd46..43dc126 100644 --- a/plugin/speakernotes/client.js +++ b/plugin/speakernotes/client.js @@ -6,7 +6,7 @@ var socketId = Math.random().toString().slice(2); console.log('View slide notes at ' + window.location.origin + '/notes/' + socketId); - window.open(window.location.origin + '/notes/' + socketId, 'notes-' + socketId) + window.open(window.location.origin + '/notes/' + socketId, 'notes-' + socketId); Reveal.addEventListener( 'slidechanged', function( event ) { var nextindexh; -- cgit v1.2.3 From 46e270e59f9aae7a3528fcd3f9d2287f341c0be7 Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Thu, 18 Oct 2012 23:59:43 +0200 Subject: Broadcast fragmentdata --- plugin/speakernotes/index.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'plugin') diff --git a/plugin/speakernotes/index.js b/plugin/speakernotes/index.js index 17314f3..7387f5d 100644 --- a/plugin/speakernotes/index.js +++ b/plugin/speakernotes/index.js @@ -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() { -- cgit v1.2.3 From c46486b3df7db25912bc085c7d84612b0724a7cc Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Fri, 19 Oct 2012 00:04:40 +0200 Subject: Add event listener 'fragmentshown' and 'fragmenthidden' And emit 'fragmentchanged' with the appropriate fragmentData to show or hide fragments. --- plugin/speakernotes/client.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'plugin') diff --git a/plugin/speakernotes/client.js b/plugin/speakernotes/client.js index 43dc126..757e6cd 100644 --- a/plugin/speakernotes/client.js +++ b/plugin/speakernotes/client.js @@ -8,6 +8,25 @@ console.log('View slide notes at ' + window.location.origin + '/notes/' + socketId); window.open(window.location.origin + '/notes/' + socketId, 'notes-' + socketId); + // Fires when a fragment is shown + Reveal.addEventListener( 'fragmentshown', function( event ) { + var fragmentData = { + showFragment : true, + socketId : socketId + }; + socket.emit('fragmentchanged', fragmentData); + } ); + + // Fires when a fragment is hidden + Reveal.addEventListener( 'fragmenthidden', function( event ) { + var fragmentData = { + hideFragment : true, + socketId : socketId + }; + socket.emit('fragmentchanged', fragmentData); + } ); + + // Fires when slide is changed Reveal.addEventListener( 'slidechanged', function( event ) { var nextindexh; var nextindexv; -- cgit v1.2.3 From d02e64adbd986d44dd02a70aec54aac606cdf7ab Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Fri, 19 Oct 2012 00:07:26 +0200 Subject: get 'fragmentdata' and react by showing/hiding the corresponding fragments --- plugin/speakernotes/notes.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'plugin') diff --git a/plugin/speakernotes/notes.html b/plugin/speakernotes/notes.html index c051879..af42480 100644 --- a/plugin/speakernotes/notes.html +++ b/plugin/speakernotes/notes.html @@ -110,6 +110,7 @@ socket.on('slidedata', function(data) { // ignore data from sockets that aren't ours + console.dir(data); if (data.socketId !== socketId) { return; } if (data.markdown) { @@ -122,6 +123,18 @@ 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 + console.dir(data); + if (data.socketId !== socketId) { return; } + + if (data.showFragment === true) { + currentSlide.contentWindow.Reveal.nextFragment(); + } + else if (data.hideFragment === true) { + currentSlide.contentWindow.Reveal.previousFragment(); + } + }); -- cgit v1.2.3 From 82bd8e4fb07c789d54aca58198963e977ffbd589 Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Fri, 19 Oct 2012 00:12:53 +0200 Subject: Renaming key within fragmentData Might be better to use one variable with different values. --- plugin/speakernotes/client.js | 4 ++-- plugin/speakernotes/notes.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugin') diff --git a/plugin/speakernotes/client.js b/plugin/speakernotes/client.js index 757e6cd..156cb9a 100644 --- a/plugin/speakernotes/client.js +++ b/plugin/speakernotes/client.js @@ -11,7 +11,7 @@ // Fires when a fragment is shown Reveal.addEventListener( 'fragmentshown', function( event ) { var fragmentData = { - showFragment : true, + fragment : 'next', socketId : socketId }; socket.emit('fragmentchanged', fragmentData); @@ -20,7 +20,7 @@ // Fires when a fragment is hidden Reveal.addEventListener( 'fragmenthidden', function( event ) { var fragmentData = { - hideFragment : true, + fragment : 'previous', socketId : socketId }; socket.emit('fragmentchanged', fragmentData); diff --git a/plugin/speakernotes/notes.html b/plugin/speakernotes/notes.html index af42480..f3b610d 100644 --- a/plugin/speakernotes/notes.html +++ b/plugin/speakernotes/notes.html @@ -128,10 +128,10 @@ console.dir(data); if (data.socketId !== socketId) { return; } - if (data.showFragment === true) { + if (data.fragment === 'next') { currentSlide.contentWindow.Reveal.nextFragment(); } - else if (data.hideFragment === true) { + else if (data.fragment === 'previous') { currentSlide.contentWindow.Reveal.previousFragment(); } }); -- cgit v1.2.3 From c39f5fc0b0ba4f32854b5e58c71beda6fb295270 Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Fri, 19 Oct 2012 00:14:46 +0200 Subject: Oops. Delete console output. --- plugin/speakernotes/notes.html | 2 -- 1 file changed, 2 deletions(-) (limited to 'plugin') diff --git a/plugin/speakernotes/notes.html b/plugin/speakernotes/notes.html index f3b610d..9198386 100644 --- a/plugin/speakernotes/notes.html +++ b/plugin/speakernotes/notes.html @@ -110,7 +110,6 @@ socket.on('slidedata', function(data) { // ignore data from sockets that aren't ours - console.dir(data); if (data.socketId !== socketId) { return; } if (data.markdown) { @@ -125,7 +124,6 @@ }); socket.on('fragmentdata', function(data) { // ignore data from sockets that aren't ours - console.dir(data); if (data.socketId !== socketId) { return; } if (data.fragment === 'next') { -- cgit v1.2.3 From ff8ccbb02e4375c1601028db322fae4934342955 Mon Sep 17 00:00:00 2001 From: Michael Kühnel Date: Fri, 19 Oct 2012 00:35:23 +0200 Subject: Update renamed API method See b957d0b8580bafb35fbb808ef1d7acf424f73895 --- plugin/speakernotes/notes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugin') diff --git a/plugin/speakernotes/notes.html b/plugin/speakernotes/notes.html index 9198386..d71d7f8 100644 --- a/plugin/speakernotes/notes.html +++ b/plugin/speakernotes/notes.html @@ -130,7 +130,7 @@ currentSlide.contentWindow.Reveal.nextFragment(); } else if (data.fragment === 'previous') { - currentSlide.contentWindow.Reveal.previousFragment(); + currentSlide.contentWindow.Reveal.prevFragment(); } }); -- cgit v1.2.3