diff options
| author | David Banham <david@banham.id.au> | 2013-03-08 11:51:58 +1100 |
|---|---|---|
| committer | David Banham <david@banham.id.au> | 2013-03-08 12:43:18 +1100 |
| commit | 580a72c4449c57cb743e09f44eeeb374cd00f172 (patch) | |
| tree | 684a7f7920e903f6372e590d606aede0b09fb287 /plugin/multiplex/master.js | |
| parent | 61c229a4f969a0720085c2710f8a7cfd8a12b4a6 (diff) | |
| download | freenode-live-2017-presentation-580a72c4449c57cb743e09f44eeeb374cd00f172.tar freenode-live-2017-presentation-580a72c4449c57cb743e09f44eeeb374cd00f172.tar.gz | |
Bring multiplex up to date
Diffstat (limited to 'plugin/multiplex/master.js')
| -rw-r--r-- | plugin/multiplex/master.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/multiplex/master.js b/plugin/multiplex/master.js index 3704fa4..a896244 100644 --- a/plugin/multiplex/master.js +++ b/plugin/multiplex/master.js @@ -1,6 +1,7 @@ (function() { // don't emit events from inside the previews themselves if ( window.location.search.match( /receiver/gi ) ) { return; } + var multiplex = window.globals.multiplex; var socket = io.connect(multiplex.url); @@ -27,6 +28,6 @@ socketId : multiplex.id }; - if( event.origin !== 'remote') socket.emit('slidechanged', slideData); + if( typeof event.origin === 'undefined' && event.origin !== 'remote') socket.emit('slidechanged', slideData); } ); }()); |