merge mutiplex fragment fix #395

js/reveal.js

@@ -2050,6 +2050,17 @@ var Reveal = (function(){
 			return config;
 		},
 
+		// Returns an index (1-based) of the current fragment
+		getCurrentFragmentIndex : function() {
+			if( currentSlide ) {
+				var visibleFragments = currentSlide.querySelectorAll( '.fragment.visible' );
+
+				if( visibleFragments.length ) {
+					return visibleFragments.length;
+				}
+			}
+		},
+
 		// Helper method, retrieves query string as a key/value hash
 		getQueryHash: function() {
 			var query = {};

plugin/multiplex/client.js

@@ -8,6 +8,6 @@
 		if (data.socketId !== socketId) { return; }
 		if( window.location.host === 'localhost:1947' ) return;
 
-		Reveal.slide(data.indexh, data.indexv, null, 'remote');
+		Reveal.slide(data.indexh, data.indexv, data.indexf, 'remote');
 	});
 }());

plugin/multiplex/master.js

@@ -5,28 +5,46 @@
 
 	var socket = io.connect(multiplex.url);
 
-	Reveal.addEventListener( 'slidechanged', function( event ) {
+	var notify = function( slideElement, indexh, indexv, origin ) {
-		var nextindexh;
+		if( typeof origin === 'undefined' && origin !== 'remote' ) {
-		var nextindexv;
+			var nextindexh;
-		var slideElement = event.currentSlide;
+			var nextindexv;
 
-		if (slideElement.nextElementSibling && slideElement.parentNode.nodeName == 'SECTION') {
+			var fragmentindex = Reveal.getCurrentFragmentIndex();
-			nextindexh = event.indexh;
+			if (typeof fragmentindex == 'undefined') {
-			nextindexv = event.indexv + 1;
+				fragmentindex = 0;
-		} else {
+			}
-			nextindexh = event.indexh + 1;
+
-			nextindexv = 0;
+			if (slideElement.nextElementSibling && slideElement.parentNode.nodeName == 'SECTION') {
+				nextindexh = indexh;
+				nextindexv = indexv + 1;
+			} else {
+				nextindexh = indexh + 1;
+				nextindexv = 0;
+			}	
+
+			var slideData = {
+				indexh : indexh,
+				indexv : indexv,
+				indexf : fragmentindex,
+				nextindexh : nextindexh,
+				nextindexv : nextindexv,
+				secret: multiplex.secret,
+				socketId : multiplex.id
+			};
+
+			socket.emit('slidechanged', slideData);
 		}
+	}
 
-		var slideData = {
+	Reveal.addEventListener( 'slidechanged', function( event ) {
-			indexh : event.indexh,
+		notify( event.currentSlide, event.indexh, event.indexv, event.origin );
-			indexv : event.indexv,
-			nextindexh : nextindexh,
-			nextindexv : nextindexv,
-			secret: multiplex.secret,
-			socketId : multiplex.id
-		};
-
-		if( typeof event.origin === 'undefined' && event.origin !== 'remote' ) socket.emit('slidechanged', slideData);
 	} );
+
+	var fragmentNotify = function( event ) {
+		notify( Reveal.getCurrentSlide(), Reveal.getIndices().h, Reveal.getIndices().v, event.origin );
+	};
+
+	Reveal.addEventListener( 'fragmentshown', fragmentNotify );
+	Reveal.addEventListener( 'fragmenthidden', fragmentNotify );
 }());