mirror/reveal.js
1
0
Fork 0
mirror of https://github.com/hakimel/reveal.js.git synced 2025-08-17 12:01:15 +02:00
Code Issues Releases Wiki Activity

data-autoslide on vertical parent now applies to all child slides #685

Browse Source
This commit is contained in:
Hakim El Hattab
2013-11-07 09:12:49 -05:00
parent a119c83f86
commit 150cb81405
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/reveal.js
View File

@@ -2327,12 +2327,17 @@ var Reveal = (function(){
if( currentSlide ) { if( currentSlide ) {
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, // If the current slide has a data-autoslide use that,
// otherwise use the config.autoSlide value // otherwise use the config.autoSlide value
var slideAutoSlide = currentSlide.getAttribute( 'data-autoslide' );
if( slideAutoSlide ) { if( slideAutoSlide ) {
autoSlide = parseInt( slideAutoSlide, 10 ); autoSlide = parseInt( slideAutoSlide, 10 );
} }
else if( parentAutoSlide ) {
autoSlide = parseInt( parentAutoSlide, 10 );
}
else { else {
autoSlide = config.autoSlide; autoSlide = config.autoSlide;
} }

6
js/reveal.min.js vendored
View File

File diff suppressed because one or more lines are too long