xobs/fossasia-22-renode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dont toggle paused/overview modes needlessly when setting state

Browse Source
This commit is contained in:
Hakim El Hattab 2014-04-22 14:06:58 +02:00
parent 9b2851376d
commit ce05138f9a
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/reveal.js
View File

@ -968,8 +968,6 @@ var Reveal = (function(){
*/ */
function dispatchEvent( type, args ) { function dispatchEvent( type, args ) {
console.log('event', type);
var event = document.createEvent( 'HTMLEvents', 1, 2 ); var event = document.createEvent( 'HTMLEvents', 1, 2 );
event.initEvent( type, true, true ); event.initEvent( type, true, true );
extend( event, args ); extend( event, args );
@ -2498,8 +2496,17 @@ var Reveal = (function(){
if( typeof state === 'object' ) { if( typeof state === 'object' ) {
slide( deserialize( state.indexh ), deserialize( state.indexv ), deserialize( state.indexf ) ); 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 );
}
} }
} }

10
plugin/notes/notes.html
View File

@ -249,7 +249,13 @@
*/ */
function setupIframes( data ) { 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; var hash = '#/' + data.state.indexh + '/' + data.state.indexv;
currentSlide = document.createElement( 'iframe' ); currentSlide = document.createElement( 'iframe' );
@ -261,7 +267,7 @@
nextSlide = document.createElement( 'iframe' ); nextSlide = document.createElement( 'iframe' );
nextSlide.setAttribute( 'width', 640 ); nextSlide.setAttribute( 'width', 640 );
nextSlide.setAttribute( 'height', 512 ); 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 ); document.querySelector( '#next-slide' ).appendChild( nextSlide );
} }

2
plugin/notes/notes.js
View File

@ -14,7 +14,7 @@ var RevealNotes = (function() {
function openNotes() { function openNotes() {
var jsFileLocation = document.querySelector('script[src$="notes.js"]').src; // this js file path var jsFileLocation = document.querySelector('script[src$="notes.js"]').src; // this js file path
jsFileLocation = jsFileLocation.replace(/notes\.js(\?.*)?$/, ''); // the js folder 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. * Connect to the notes window through a postmessage handshake.