aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMichiK <michik+github@michik.net>2015-11-19 13:00:01 +0100
committerMichiK <michik+github@michik.net>2015-11-19 13:00:01 +0100
commit4a45557b576c945aba71d0b5728c9a9c7510b699 (patch)
treed470fab1fe1d1b4106ccdd02b8faffd17226202a /js
parentc0afa01e6ada174e3a9e17ff810a012fbde91796 (diff)
downloadfosdem-2018-presentation-4a45557b576c945aba71d0b5728c9a9c7510b699.tar
fosdem-2018-presentation-4a45557b576c945aba71d0b5728c9a9c7510b699.tar.gz
Add a more flexible autoSlideMethod option
Auto-sliding will now use the method specified in the config if it is a function or default to navigateNext.
Diffstat (limited to 'js')
-rw-r--r--js/reveal.js16
1 files changed, 5 insertions, 11 deletions
diff --git a/js/reveal.js b/js/reveal.js
index 476ec1c..db64412 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -103,11 +103,6 @@
// Stop auto-sliding after user input
autoSlideStoppable: true,
- // When auto-sliding is active, do always proceed to the right
- // instead of the next slide which may be below (useful for
- // infinite loop presentations with hidden "bonus slides")
- autoSlideRight: false,
-
// Enable slide navigation via mouse wheel
mouseWheel: false,
@@ -3693,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();
}
@@ -3828,7 +3826,7 @@
// Prioritize revealing fragments
if( nextFragment() === false ) {
- if( availableRoutes().down && !( autoSlide && config.autoSlideRight ) ) {
+ if( availableRoutes().down ) {
navigateDown();
}
else if( config.rtl ) {
@@ -3839,10 +3837,6 @@
}
}
- // If auto-sliding is enabled we need to cue up
- // another timeout
- cueAutoSlide();
-
}
/**