Merge branch 'issue_2041' of https://github.com/denehyg/reveal.js into dev
This commit is contained in:
commit
1f1f86ec73
1 changed files with 11 additions and 10 deletions
21
js/reveal.js
21
js/reveal.js
|
@ -2453,16 +2453,7 @@
|
|||
|
||||
// Dispatch an event if the slide changed
|
||||
var slideChanged = ( indexh !== indexhBefore || indexv !== indexvBefore );
|
||||
if( slideChanged ) {
|
||||
dispatchEvent( 'slidechanged', {
|
||||
'indexh': indexh,
|
||||
'indexv': indexv,
|
||||
'previousSlide': previousSlide,
|
||||
'currentSlide': currentSlide,
|
||||
'origin': o
|
||||
} );
|
||||
}
|
||||
else {
|
||||
if (!slideChanged) {
|
||||
// Ensure that the previous slide is never the same as the current
|
||||
previousSlide = null;
|
||||
}
|
||||
|
@ -2490,6 +2481,16 @@
|
|||
}
|
||||
}
|
||||
|
||||
if( slideChanged ) {
|
||||
dispatchEvent( 'slidechanged', {
|
||||
'indexh': indexh,
|
||||
'indexv': indexv,
|
||||
'previousSlide': previousSlide,
|
||||
'currentSlide': currentSlide,
|
||||
'origin': o
|
||||
} );
|
||||
}
|
||||
|
||||
// Handle embedded content
|
||||
if( slideChanged || !previousSlide ) {
|
||||
stopEmbeddedContent( previousSlide );
|
||||
|
|
Loading…
Reference in a new issue