comments
This commit is contained in:
		@@ -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 );
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								js/reveal.min.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								js/reveal.min.js
									
									
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
 *
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user