Home Explore Help
Register Sign In
noa
/
functionnal
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

add gridNavigation config to configure navigation between adjacent vertical stacks

Hakim El Hattab 5 years ago
parent
db9c346b41
commit
665dfb9cd6
2 changed files with 92 additions and 4 deletions
Unified View Show Diff Stats
  1. 18 4
      js/reveal.js
  2. 74 0
      test/test-grid-navigation.html

+ 18 - 4
js/reveal.js
View File 

@@ -104,6 +104,20 @@
 
 			// Change the presentation direction to be RTL
 
 			// Change the presentation direction to be RTL
 
 			rtl: false,
 
 			rtl: false,
 
 
 
+			// When this is enabled, stepping left/right from a vertical stack
 
+			// to an adjacent vertical stack will land you at the same vertical
 
+			// index.
 
+			//
 
+			// Consider a deck with six slides ordered in two stacks like this:
 
+			// 1.1    2.1
 
+			// 1.2    2.2
 
+			// 1.3    2.3
 
+			//
 
+			// If you're on slide 1.3 and navigate right, you will normally move
 
+			// from 1.3 -> 2.1. With "grid" enabled the same navigation takes you
 
+			// from 1.3 -> 2.3.
 
+			gridNavigation: false,
 
+
 
 			// Randomizes the order of slides each time the presentation loads
 
 			// Randomizes the order of slides each time the presentation loads
 
 			shuffle: false,
 
 			shuffle: false,
 
 
 
@@ -4678,12 +4692,12 @@
 
 		// Reverse for RTL
 
 		// Reverse for RTL
 
 		if( config.rtl ) {
 
 		if( config.rtl ) {
 
 			if( ( isOverview() || nextFragment() === false ) && availableRoutes().left ) {
 
 			if( ( isOverview() || nextFragment() === false ) && availableRoutes().left ) {
 
-				slide( indexh + 1 );
 
+				slide( indexh + 1, config.gridNavigation ? indexv : undefined );
 
 			}
 
 			}
 
 		}
 
 		}
 
 		// Normal navigation
 
 		// Normal navigation
 
 		else if( ( isOverview() || previousFragment() === false ) && availableRoutes().left ) {
 
 		else if( ( isOverview() || previousFragment() === false ) && availableRoutes().left ) {
 
-			slide( indexh - 1 );
 
+			slide( indexh - 1, config.gridNavigation ? indexv : undefined );
 
 		}
 
 		}
 
 
 
 	}
 
 	}
 
@@ -4695,12 +4709,12 @@
 
 		// Reverse for RTL
 
 		// Reverse for RTL
 
 		if( config.rtl ) {
 
 		if( config.rtl ) {
 
 			if( ( isOverview() || previousFragment() === false ) && availableRoutes().right ) {
 
 			if( ( isOverview() || previousFragment() === false ) && availableRoutes().right ) {
 
-				slide( indexh - 1 );
 
+				slide( indexh - 1, config.gridNavigation ? indexv : undefined );
 
 			}
 
 			}
 
 		}
 
 		}
 
 		// Normal navigation
 
 		// Normal navigation
 
 		else if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) {
 
 		else if( ( isOverview() || nextFragment() === false ) && availableRoutes().right ) {
 
-			slide( indexh + 1 );
 
+			slide( indexh + 1, config.gridNavigation ? indexv : undefined );
 
 		}
 
 		}
 
 
 
 	}
 
 	}

+ 74 - 0
test/test-grid-navigation.html
View File 

@@ -0,0 +1,74 @@
 
+<!doctype html>
 
+<html lang="en">
 
+
 
+	<head>
 
+		<meta charset="utf-8">
 
+
 
+		<title>reveal.js - Test Grid</title>
 
+
 
+		<link rel="stylesheet" href="../css/reveal.css">
 
+		<link rel="stylesheet" href="qunit-2.5.0.css">
 
+	</head>
 
+
 
+	<body style="overflow: auto;">
 
+
 
+		<div id="qunit"></div>
 
+		<div id="qunit-fixture"></div>
 
+
 
+		<div class="reveal" style="display: none;">
 
+
 
+			<div class="slides">
 
+
 
+				<section>0</section>
 
+				<section>
 
+					<section>1.1</section>
 
+					<section>1.2</section>
 
+					<section>1.3</section>
 
+					<section>1.4</section>
 
+				</section>
 
+				<section>
 
+					<section>2.1</section>
 
+					<section>2.2</section>
 
+					<section>2.3</section>
 
+					<section>2.4</section>
 
+				</section>
 
+
 
+			</div>
 
+
 
+		</div>
 
+
 
+		<script src="../js/reveal.js"></script>
 
+		<script src="qunit-2.5.0.js"></script>
 
+
 
+		<script>
 
+			Reveal.addEventListener( 'ready', function() {
 
+
 
+				QUnit.module( 'Grid Navigation' );
 
+
 
+				QUnit.test( 'Disabled', function( assert ) {
 
+					Reveal.right();
 
+					Reveal.down();
 
+					Reveal.down();
 
+					assert.deepEqual( Reveal.getIndices(), { h: 1, v: 2, f: undefined }, 'Correct starting point' );
 
+					Reveal.right();
 
+					assert.deepEqual( Reveal.getIndices(), { h: 2, v: 0, f: undefined }, 'Moves to top when going to adjacent stack' );
 
+				});
 
+
 
+				QUnit.test( 'Enabled', function( assert ) {
 
+					Reveal.configure({ gridNavigation: true });
 
+					Reveal.slide( 0, 0 );
 
+					Reveal.right();
 
+					Reveal.down();
 
+					Reveal.down();
 
+					assert.deepEqual( Reveal.getIndices(), { h: 1, v: 2, f: undefined }, 'Correct starting point' );
 
+					Reveal.right();
 
+					assert.deepEqual( Reveal.getIndices(), { h: 2, v: 2, f: undefined }, 'Remains at same vertical index when going to adjacent stack' );
 
+				});
 
+
 
+			} );
 
+
 
+			Reveal.initialize();
 
+		</script>
 
+
 
+	</body>
 
+</html>