jan/revproxy-presentation
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev' of github.com:hakimel/reveal.js into dev

Browse source
This commit is contained in:
Hakim El Hattab 2015-11-19 15:30:43 +01:00
commit 0cd4e2c84f
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/reveal.js
View file

@ -3688,7 +3688,10 @@
// - The overview isn't active
// - The presentation isn't over
if( autoSlide && !autoSlidePaused && !isPaused() && !isOverview() && ( !Reveal.isLastSlide() || availableFragments().next || config.loop === true ) ) {
autoSlideTimeout = setTimeout( navigateNext, autoSlide );
autoSlideTimeout = setTimeout( function() {
typeof config.autoSlideMethod === 'function' ? config.autoSlideMethod() : navigateNext();
cueAutoSlide();
}, autoSlide );
autoSlideStartTime = Date.now();
}
@ -3834,10 +3837,6 @@
}
}
// If auto-sliding is enabled we need to cue up
// another timeout
cueAutoSlide();
}
/**