diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2013-11-07 09:15:56 -0500 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2013-11-07 09:15:56 -0500 |
| commit | 3653ad5b19cc48eb6c84de0f7c52b1aa8dac55e3 (patch) | |
| tree | d98f1b136aac92e66c41f9c696b50367c0864cbd | |
| parent | 150cb814058101cb1e1937ba11e8254d55958fa0 (diff) | |
| download | fosdem-2018-presentation-3653ad5b19cc48eb6c84de0f7c52b1aa8dac55e3.tar fosdem-2018-presentation-3653ad5b19cc48eb6c84de0f7c52b1aa8dac55e3.tar.gz | |
comments
| -rw-r--r-- | js/reveal.js | 6 | ||||
| -rw-r--r-- | js/reveal.min.js | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/js/reveal.js b/js/reveal.js index a2ceb7b..aef25e6 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -2330,8 +2330,10 @@ var Reveal = (function(){ var parentAutoSlide = currentSlide.parentNode ? currentSlide.parentNode.getAttribute( 'data-autoslide' ) : null; var slideAutoSlide = currentSlide.getAttribute( 'data-autoslide' ); - // If the current slide has a data-autoslide use that, - // otherwise use the config.autoSlide value + // Pick value in the following priority order: + // 1. Current slide's data-autoslide + // 2. Parent slide's data-autoslide + // 3. Global autoSlide setting if( slideAutoSlide ) { autoSlide = parseInt( slideAutoSlide, 10 ); } diff --git a/js/reveal.min.js b/js/reveal.min.js index b4e4bd9..bf0d0aa 100644 --- a/js/reveal.min.js +++ b/js/reveal.min.js @@ -1,5 +1,5 @@ /*! - * reveal.js 2.6.0-dev (2013-11-07, 09:11) + * reveal.js 2.6.0-dev (2013-11-07, 09:15) * http://lab.hakim.se/reveal-js * MIT licensed * |