comments

diff --git a/js/reveal.js b/js/reveal.js
index a2ceb7bd873eab41feab40a9b0b4d07ee65269f4..aef25e602915a2fcbc7ec2fdf2901247f339ba01 100644 (file)
--- 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 b4e4bd99abf20bd83a974b11dd1b0ea105d49fbc..bf0d0aa5c14127d09ea75b712e726c8b031376fa 100644 (file)
--- 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
  *