From a2e021ccdb9d6acfc9cfa92d334430fbc1d1366a Mon Sep 17 00:00:00 2001
From: David Banham
Date: Mon, 6 Aug 2012 11:20:08 +1000
Subject: Don't suppress the whole event, just add context metadata

---
 plugin/multiplex/client.js | 2 +-
 plugin/multiplex/master.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugin/multiplex')

diff --git a/plugin/multiplex/client.js b/plugin/multiplex/client.js
index 5e6b556..6fc0d4d 100644
--- a/plugin/multiplex/client.js
+++ b/plugin/multiplex/client.js
@@ -7,6 +7,6 @@
 		if (data.socketId !== socketId) { return; }
 		if( window.location.host === 'localhost:1947' ) return;
 
-		Reveal.navigateTo(data.indexh, data.indexv, false);
+		Reveal.navigateTo(data.indexh, data.indexv, 'remote');
 	});
 }());
diff --git a/plugin/multiplex/master.js b/plugin/multiplex/master.js
index cf629d9..3704fa4 100644
--- a/plugin/multiplex/master.js
+++ b/plugin/multiplex/master.js
@@ -27,6 +27,6 @@
 			socketId : multiplex.id
 		};
 
-		socket.emit('slidechanged', slideData);
+		if( event.origin !== 'remote') socket.emit('slidechanged', slideData);
 	} );
 }());
-- 
cgit v1.2.3