ソースを参照

fix error when exiting overview

Hakim El Hattab 10 年 前
コミット
8e66876c4e
1 ファイル変更5 行追加6 行削除
  1. 5 6
      js/reveal.js

+ 5 - 6
js/reveal.js

@@ -1074,8 +1074,8 @@
 	function transformSlides( transforms ) {
 
 		// Pick up new transforms from arguments
-		if( transforms.layout ) slidesTransform.layout = transforms.layout;
-		if( transforms.overview ) slidesTransform.overview = transforms.overview;
+		if( typeof transforms.layout === 'string' ) slidesTransform.layout = transforms.layout;
+		if( typeof transforms.overview === 'string' ) slidesTransform.overview = transforms.overview;
 
 		// Apply the transforms to the slides container
 		if( slidesTransform.layout ) {
@@ -1085,7 +1085,6 @@
 			transformElement( dom.slides, slidesTransform.overview );
 		}
 
-
 	}
 
 	/**
@@ -1780,8 +1779,6 @@
 		// Only proceed if enabled in config
 		if( config.overview ) {
 
-			transformSlides( { overview: '' } );
-
 			overview = false;
 
 			dom.wrapper.classList.remove( 'overview' );
@@ -1811,6 +1808,8 @@
 				transformElement( background, '' );
 			} );
 
+			transformSlides( { overview: '' } );
+
 			slide( indexh, indexv );
 
 			layout();
@@ -2053,7 +2052,7 @@
 			document.documentElement.classList.remove( stateBefore.pop() );
 		}
 
-		// If the overview is active, re-activate it to update positions
+		// Update the overview if it's currently active
 		if( isOverview() ) {
 			updateOverview();
 		}