merge in support for stepped fragments in notes window

2 files changed, 77 insertions, 68 deletions

diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index 485edec..013a18b 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -109,45 +109,30 @@
 
 					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;
+						// 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 );
+							}
+							else {
+								notes.innerHTML = data.notes;
+							}
 						}
 
-						// 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 );
 
-						// Resume listening on the next cycle
-						setTimeout( addSlideListeners, 1 );
+						// Showing and hiding fragments
+						if( data.fragment === 'next' ) {
+							currentSlide.contentWindow.Reveal.nextFragment();
+						}
+						else if( data.fragment === 'prev' ) {
+							currentSlide.contentWindow.Reveal.prevFragment();
+						}
 
 					}, 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 729dad3..7c83366 100644
--- a/plugin/notes/notes.js
+++ b/plugin/notes/notes.js
@@ -7,54 +7,78 @@ var RevealNotes = (function() {
 	function openNotes() {
 		var notesPopup = window.open( 'plugin/notes/notes.html', 'reveal.js - Notes', 'width=1120,height=850' );
 
-		Reveal.addEventListener( 'slidechanged', post );
+		// Fires when slide is changed
+		Reveal.addEventListener( 'slidechanged', function( event ) {
+			post('slidechanged');
+		} );
 
-		// Posts the current slide data to the notes window
-		function post() {
-			var slideElement = Reveal.getCurrentSlide(),
-				indexh = Reveal.getIndices().h,
-				indexv = Reveal.getIndices().v,
-				nextindexh,
-				nextindexv;
+		// Fires when a fragment is shown
+		Reveal.addEventListener( 'fragmentshown', function( event ) {
+			post('fragmentshown');
+		} );
 
-			if( slideElement.nextElementSibling && slideElement.parentNode.nodeName == 'SECTION' ) {
-				nextindexh = indexh;
-				nextindexv = indexv + 1;
-			} else {
-				nextindexh = indexh + 1;
-				nextindexv = 0;
-			}
+		// Fires when a fragment is hidden
+		Reveal.addEventListener( 'fragmenthidden', function( event ) {
+			post('fragmenthidden');
+		} );
 
-			var notes = slideElement.querySelector( 'aside.notes' );
+		/**
+		 * Posts the current slide data to the notes window
+		 *
+		 * @param {String} eventType Expecting 'slidechanged', 'fragmentshown' 
+		 * or 'fragmenthidden' set in the events above to define the needed 
+		 * slideDate.
+		 */
+		function post( eventType ) {
+			var slideElement = Reveal.getCurrentSlide(),
+				messageData;
 
-			var slideData = {
-				notes : notes ? notes.innerHTML : '',
-				indexh : indexh,
-				indexv : indexv,
-				nextindexh : nextindexh,
-				nextindexv : nextindexv,
-				markdown : notes ? typeof notes.getAttribute( 'data-markdown' ) === 'string' : false
-			};
+			if( eventType === 'slidechanged' ) {
+				var notes = slideElement.querySelector( 'aside.notes' ),
+					indexh = Reveal.getIndices().h,
+					indexv = Reveal.getIndices().v,
+					nextindexh,
+					nextindexv;
 
-			notesPopup.postMessage( JSON.stringify( slideData ), '*' );
-		}
+				if( slideElement.nextElementSibling && slideElement.parentNode.nodeName == 'SECTION' ) {
+					nextindexh = indexh;
+					nextindexv = indexv + 1;
+				} else {
+					nextindexh = indexh + 1;
+					nextindexv = 0;
+				}
 
-		// 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 );
+				messageData = {
+					notes : notes ? notes.innerHTML : '',
+					indexh : indexh,
+					indexv : indexv,
+					nextindexh : nextindexh,
+					nextindexv : nextindexv,
+					markdown : notes ? typeof notes.getAttribute( 'data-markdown' ) === 'string' : false
+				};
 			}
-		} );
+			else if( eventType === 'fragmentshown' ) {
+				messageData = {
+					fragment : 'next'
+				};
+			}
+			else if( eventType === 'fragmenthidden' ) {
+				messageData = {
+					fragment : 'prev'
+				};
+			}
+
+			notesPopup.postMessage( JSON.stringify( messageData ), '*' );
+		}
 
 		// Navigate to the current slide when the notes are loaded
-		notesPopup.addEventListener( 'load', post, false );
+		notesPopup.addEventListener( 'load', function( event ) {
+			post('slidechanged');
+		}, false );
 	}
 
 	// If the there's a 'notes' query set, open directly
-	if( window.location.search.match(/(\?|\&)notes/gi ) !== null ) {
+	if( window.location.search.match( /(\?|\&)notes/gi ) !== null ) {
 		openNotes();
 	}
 
@@ -70,5 +94,5 @@ var RevealNotes = (function() {
 		}
 	}, false );
 
-	return { open: openNotes }
-})();
\ No newline at end of file
+	return { open: openNotes };
+})();