浏览代码

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

Hakim El Hattab 11 年之前
父节点
当前提交
150cb81405
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 6 1
      js/reveal.js
  2. 1 1
      js/reveal.min.js

+ 6 - 1
js/reveal.js

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

文件差异内容过多而无法显示
+ 1 - 1
js/reveal.min.js


部分文件因为文件数量过多而无法显示