diff options
| author | David Banham <david.banham@gmail.com> | 2012-08-06 11:20:08 +1000 |
|---|---|---|
| committer | David Banham <david.banham@gmail.com> | 2012-08-06 11:20:08 +1000 |
| commit | a2e021ccdb9d6acfc9cfa92d334430fbc1d1366a (patch) | |
| tree | f73c82d1a5ba6da705be24be33d5f05523cd8fa0 /plugin/multiplex | |
| parent | ee12450458ded62e176dd8b500574463297c9baa (diff) | |
| download | freenode-live-2017-presentation-a2e021ccdb9d6acfc9cfa92d334430fbc1d1366a.tar freenode-live-2017-presentation-a2e021ccdb9d6acfc9cfa92d334430fbc1d1366a.tar.gz | |
Don't suppress the whole event, just add context metadata
Diffstat (limited to 'plugin/multiplex')
| -rw-r--r-- | plugin/multiplex/client.js | 2 | ||||
| -rw-r--r-- | plugin/multiplex/master.js | 2 |
2 files changed, 2 insertions, 2 deletions
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); } ); }()); |