diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/multiplex/master.js | 3 | ||||
| -rw-r--r-- | plugin/notes/notes.html | 4 | ||||
| -rw-r--r-- | plugin/remotes/remotes.js | 6 |
3 files changed, 7 insertions, 6 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); diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html index 7e542e4..0e1238f 100644 --- a/plugin/notes/notes.html +++ b/plugin/notes/notes.html @@ -139,11 +139,11 @@ <body> <div id="wrap-current-slide" class="slides"> - <script>document.write( '<iframe width="1280" height="1024" id="current-slide" src="'+ window.opener.location.href +'"></iframe>' );</script> + <script>document.write( '<iframe width="1280" height="1024" id="current-slide" src="'+ window.opener.location.href +'?receiver"></iframe>' );</script> </div> <div id="wrap-next-slide" class="slides"> - <script>document.write( '<iframe width="640" height="512" id="next-slide" src="'+ window.opener.location.href +'"></iframe>' );</script> + <script>document.write( '<iframe width="640" height="512" id="next-slide" src="'+ window.opener.location.href +'?receiver"></iframe>' );</script> <span>UPCOMING:</span> </div> diff --git a/plugin/remotes/remotes.js b/plugin/remotes/remotes.js index 694e9c0..294c2b5 100644 --- a/plugin/remotes/remotes.js +++ b/plugin/remotes/remotes.js @@ -17,11 +17,11 @@ * Detects if notes are enable and the current page is opened inside an /iframe * this prevents loading Remotes.io several times */ - var remotesAndIsNotes = (function(){ - return !(window.RevealNotes && self == top); + var isNotesAndIframe = (function(){ + return window.RevealNotes && !(self == top); })(); - if(!hasTouch && !remotesAndIsNotes){ + if(!hasTouch && !isNotesAndIframe){ head.ready( 'remotes.ne.min.js', function() { new Remotes("preview") .on("swipe-left", function(e){ Reveal.right(); }) |