diff options
| author | Chris Lawrence | 2013-09-15 20:19:47 -0400 |
|---|---|---|
| committer | Chris Lawrence | 2013-09-15 20:19:47 -0400 |
| commit | 55f220109c4f3e7c870ebfafa6533415d5e76111 (patch) | |
| tree | d587896348e7f5d0d30752e5cb72da89d049dfec /plugin/multiplex/master.js | |
| parent | d8fb09fb64aa238a2fecafadb3839b8491f919b5 (diff) | |
| parent | 9cf7de54b8fb6bdad1342d087adfeea94604a674 (diff) | |
Merge remote-tracking branch 'upstream/master'
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 deb39cd..b6a7eb7 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 + // Don't emit events from inside of notes windows if ( window.location.search.match( /receiver/gi ) ) { return; } + var multiplex = Reveal.getConfig().multiplex; var socket = io.connect(multiplex.url); |