diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2015-11-19 15:30:43 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2015-11-19 15:30:43 +0100 |
| commit | 0cd4e2c84f4a12ed38fb723edcc8778f2d8769c1 (patch) | |
| tree | 47641fee455d270c52984908b3f406f64652d124 /js | |
| parent | bef2722eedd9671a9e0f0f9e553c0863437d1402 (diff) | |
| parent | bbe38ad2639ae483c16312f0b1594cfdea6d2a06 (diff) | |
| download | freenode-live-2017-presentation-0cd4e2c84f4a12ed38fb723edcc8778f2d8769c1.tar freenode-live-2017-presentation-0cd4e2c84f4a12ed38fb723edcc8778f2d8769c1.tar.gz | |
Merge branch 'dev' of github.com:hakimel/reveal.js into dev
Diffstat (limited to 'js')
| -rw-r--r-- | js/reveal.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/js/reveal.js b/js/reveal.js index 164996d..c11099f 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -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(); - } /** |