From ce05138f9a9065526ee584d2f59e48952910522f Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 22 Apr 2014 14:06:58 +0200 Subject: [PATCH] dont toggle paused/overview modes needlessly when setting state --- js/reveal.js | 15 +++++++++++---- plugin/notes/notes.html | 10 ++++++++-- plugin/notes/notes.js | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index cba8121..e133887 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -968,8 +968,6 @@ var Reveal = (function(){ */ function dispatchEvent( type, args ) { - console.log('event', type); - var event = document.createEvent( 'HTMLEvents', 1, 2 ); event.initEvent( type, true, true ); extend( event, args ); @@ -2498,8 +2496,17 @@ var Reveal = (function(){ if( typeof state === 'object' ) { slide( deserialize( state.indexh ), deserialize( state.indexv ), deserialize( state.indexf ) ); - togglePause( deserialize( state.paused ) ); - toggleOverview( deserialize( state.overview ) ); + + var pausedFlag = deserialize( state.paused ), + overviewFlag = deserialize( state.overview ); + + if( typeof pausedFlag === 'boolean' && pausedFlag !== isPaused() ) { + togglePause( pausedFlag ); + } + + if( typeof overviewFlag === 'boolean' && overviewFlag !== isOverview() ) { + toggleOverview( overviewFlag ); + } } } diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html index 15c7ae9..95cc525 100644 --- a/plugin/notes/notes.html +++ b/plugin/notes/notes.html @@ -249,7 +249,13 @@ */ function setupIframes( data ) { - var url = data.url + '?receiver&progress=false&overview=false&history=false'; + var params = [ + 'receiver', + 'progress=false', + 'history=false' + ]; + + var url = data.url + '?' + params.join( '&' ); var hash = '#/' + data.state.indexh + '/' + data.state.indexv; currentSlide = document.createElement( 'iframe' ); @@ -261,7 +267,7 @@ nextSlide = document.createElement( 'iframe' ); nextSlide.setAttribute( 'width', 640 ); nextSlide.setAttribute( 'height', 512 ); - nextSlide.setAttribute( 'src', url + '&controls=false' + hash ); + nextSlide.setAttribute( 'src', url + '&controls=false&transition=none&backgroundTransition=none' + hash ); document.querySelector( '#next-slide' ).appendChild( nextSlide ); } diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js index 31efd81..a0b6a5a 100644 --- a/plugin/notes/notes.js +++ b/plugin/notes/notes.js @@ -14,7 +14,7 @@ var RevealNotes = (function() { function openNotes() { var jsFileLocation = document.querySelector('script[src$="notes.js"]').src; // this js file path jsFileLocation = jsFileLocation.replace(/notes\.js(\?.*)?$/, ''); // the js folder path - var notesPopup = window.open( jsFileLocation + 'notes.html', 'reveal.js - Notes', 'width=1120,height=850' ); + var notesPopup = window.open( jsFileLocation + 'notes.html', 'reveal.js - Notes', 'width=1100,height=700' ); /** * Connect to the notes window through a postmessage handshake.