merge notes float fix and support for multiple fragments with same index

2 files changed, 27 insertions, 10 deletions

diff --git a/js/reveal.js b/js/reveal.js
index c985f79..2b77e87 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -1632,11 +1632,19 @@ var Reveal = (function(){
 			var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment:not(.visible)' ) );
 
 			if( fragments.length ) {
-				fragments[0].classList.add( 'visible' );
-
-				// Notify subscribers of the change
-				dispatchEvent( 'fragmentshown', { fragment: fragments[0] } );
-
+				// There may be multiple fragments with the same index. We want to display all of them.
+				var nextFragmentIndex = fragments[0].getAttribute( 'data-fragment-index' );
+				
+				toArray( fragments ).forEach( function( thisFragment ) {
+					var f = thisFragment.getAttribute( 'data-fragment-index' );
+					if( f === nextFragmentIndex ) {
+						thisFragment.classList.add( 'visible' );
+						
+						// Notify subscribers of the change
+						dispatchEvent( 'fragmentshown', { fragment: thisFragment } );
+					}
+				} );
+				
 				updateControls();
 				return true;
 			}
@@ -1658,10 +1666,18 @@ var Reveal = (function(){
 			var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment.visible' ) );
 
 			if( fragments.length ) {
-				fragments[ fragments.length - 1 ].classList.remove( 'visible' );
-
-				// Notify subscribers of the change
-				dispatchEvent( 'fragmenthidden', { fragment: fragments[ fragments.length - 1 ] } );
+				// There may be multiple fragments with the same index. We want to display all of them.
+				var prevFragmentIndex = fragments[0].getAttribute( 'data-fragment-index' );
+				
+				toArray( fragments ).forEach( function( thisFragment ) {
+					var f = thisFragment.getAttribute( 'data-fragment-index' );
+					if( f === prevFragmentIndex ) {
+						thisFragment.classList.remove( 'visible' );
+						
+						// Notify subscribers of the change
+						dispatchEvent( 'fragmenthidden', { fragment: thisFragment } );
+					}
+				} );
 
 				updateControls();
 				return true;
@@ -2229,4 +2245,4 @@ var Reveal = (function(){
 		}
 	};
 
-})();
\ No newline at end of file
+})();
diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index 830045d..2333878 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -14,6 +14,7 @@
 				font-size: 24px;
 				width: 640px;
 				margin-top: 5px;
+				clear: left;
 			}
 
 			#wrap-current-slide {