xobs/fa20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issue with getProgress() when called from slidechanged event on edge case

Browse Source
This commit is contained in:
Greg Denehy
2017-11-25 11:07:09 +10:30
parent a0a9aa7821
commit 8579fc773d
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/reveal.js
View File

@@ -2411,16 +2411,7 @@
// Dispatch an event if the slide changed // Dispatch an event if the slide changed
var slideChanged = ( indexh !== indexhBefore || indexv !== indexvBefore ); var slideChanged = ( indexh !== indexhBefore || indexv !== indexvBefore );
if( slideChanged ) { if (!slideChanged) {
dispatchEvent( 'slidechanged', {
'indexh': indexh,
'indexv': indexv,
'previousSlide': previousSlide,
'currentSlide': currentSlide,
'origin': o
} );
}
else {
// Ensure that the previous slide is never the same as the current // Ensure that the previous slide is never the same as the current
previousSlide = null; previousSlide = null;
} }
@@ -2448,6 +2439,16 @@
} }
} }
if( slideChanged ) {
dispatchEvent( 'slidechanged', {
'indexh': indexh,
'indexv': indexv,
'previousSlide': previousSlide,
'currentSlide': currentSlide,
'origin': o
} );
}
// Handle embedded content // Handle embedded content
if( slideChanged || !previousSlide ) { if( slideChanged || !previousSlide ) {
stopEmbeddedContent( previousSlide ); stopEmbeddedContent( previousSlide );