From 296242f8d3d5f5513d5278e72941ef868c3cb4e5 Mon Sep 17 00:00:00 2001
From: Michael Kühnel
Date: Wed, 24 Oct 2012 14:33:16 +0200
Subject: Make the fragments visible in speaker notes

---
 plugin/notes/notes.html | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'plugin/notes/notes.html')

diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index 485edec..c69950b 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -109,12 +109,15 @@
 
 					window.addEventListener( 'message', function( event ) {
 						var data = JSON.parse( event.data );
-
-						if( data.markdown ) {
-							notes.innerHTML = (new Showdown.converter()).makeHtml( data.notes );
-						}
-						else {
-							notes.innerHTML = data.notes;
+						console.log(data);
+						// No need for updating the notes in case of fragement changes
+						if ( data.notes !== undefined) {
+							if( data.markdown ) {
+								notes.innerHTML = (new Showdown.converter()).makeHtml( data.notes );
+							}
+							else {
+								notes.innerHTML = data.notes;
+							}
 						}
 
 						// Kill the slide listeners while responding to the event
@@ -124,6 +127,14 @@
 						currentSlide.contentWindow.Reveal.slide( data.indexh, data.indexv );
 						nextSlide.contentWindow.Reveal.slide( data.nextindexh, data.nextindexv );
 
+						// Showing and hiding fragments
+						if (data.fragment === 'next') {
+							currentSlide.contentWindow.Reveal.nextFragment();
+						}
+						else if (data.fragment === 'prev') {
+							currentSlide.contentWindow.Reveal.prevFragment();
+						}
+
 						// Resume listening on the next cycle
 						setTimeout( addSlideListeners, 1 );
 
-- 
cgit v1.2.3


From 13e7550afe26b216de6a9f97b3a55b60a2ee4cde Mon Sep 17 00:00:00 2001
From: Michael Kühnel
Date: Wed, 24 Oct 2012 14:53:50 +0200
Subject: Delete console output.

---
 plugin/notes/notes.html | 3 +--
 plugin/notes/notes.js   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugin/notes/notes.html')

diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index c69950b..775ccb4 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -109,8 +109,7 @@
 
 					window.addEventListener( 'message', function( event ) {
 						var data = JSON.parse( event.data );
-						console.log(data);
-						// No need for updating the notes in case of fragement changes
+						// No need for updating the notes in case of fragment changes
 						if ( data.notes !== undefined) {
 							if( data.markdown ) {
 								notes.innerHTML = (new Showdown.converter()).makeHtml( data.notes );
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js
index 45d13a4..0573440 100644
--- a/plugin/notes/notes.js
+++ b/plugin/notes/notes.js
@@ -29,7 +29,6 @@ var RevealNotes = (function() {
 		 *                                 set in the events above to define the needed slideDate.
 		 */
 		function post(eventType) {
-			console.log(eventType);
 			var slideElement = Reveal.getCurrentSlide(),
 				indexh = Reveal.getIndices().h,
 				indexv = Reveal.getIndices().v,
-- 
cgit v1.2.3


From 1801bf67eaf1fac8cb5776fe9ba83cc9e13272d6 Mon Sep 17 00:00:00 2001
From: Michael Kühnel
Date: Wed, 24 Oct 2012 15:06:32 +0200
Subject: Delete functionality to control presentation from notes window

Its was impossible (at least for me) to keep the windows in sync without bloating the code too much.
---
 plugin/notes/notes.html | 25 -------------------------
 plugin/notes/notes.js   | 10 ----------
 2 files changed, 35 deletions(-)

(limited to 'plugin/notes/notes.html')

diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index 775ccb4..90083cf 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -119,9 +119,6 @@
 							}
 						}
 
-						// Kill the slide listeners while responding to the event
-						removeSlideListeners();
-
 						// Update the note slides
 						currentSlide.contentWindow.Reveal.slide( data.indexh, data.indexv );
 						nextSlide.contentWindow.Reveal.slide( data.nextindexh, data.nextindexv );
@@ -134,30 +131,8 @@
 							currentSlide.contentWindow.Reveal.prevFragment();
 						}
 
-						// Resume listening on the next cycle
-						setTimeout( addSlideListeners, 1 );
-
 					}, false );
 
-					function addSlideListeners() {
-						currentSlide.contentWindow.Reveal.addEventListener( 'slidechanged', onNotesSlideChange, false );
-						nextSlide.contentWindow.Reveal.addEventListener( 'slidechanged', onNotesSlideChange, false );
-					}
-
-					function removeSlideListeners() {
-						currentSlide.contentWindow.Reveal.removeEventListener( 'slidechanged', onNotesSlideChange, false );
-						nextSlide.contentWindow.Reveal.removeEventListener( 'slidechanged', onNotesSlideChange, false );
-					}
-
-					function onNotesSlideChange( event ) {
-						window.opener.postMessage( JSON.stringify({
-							indexh : event.indexh,
-							indexv : event.indexv
-						}), '*' );
-					}
-
-					addSlideListeners();
-
 				})( window );
 
 			}, false );
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js
index 0573440..00d386d 100644
--- a/plugin/notes/notes.js
+++ b/plugin/notes/notes.js
@@ -69,16 +69,6 @@ var RevealNotes = (function() {
 			notesPopup.postMessage( JSON.stringify( slideData ), '*' );
 		}
 
-		// The main presentation is kept in sync when navigating the
-		// note slides so that the popup may be used as a remote
-		window.addEventListener( 'message', function( event ) {
-			var data = JSON.parse( event.data );
-
-			if( data && typeof data.indexh === 'number' && typeof data.indexv === 'number' ) {
-				Reveal.slide( data.indexh, data.indexv );
-			}
-		} );
-
 		// Navigate to the current slide when the notes are loaded
 		notesPopup.addEventListener( 'load', function( event ) {
 			post('slidechanged');
-- 
cgit v1.2.3