From 6f2d2f337eb6db3fe928213427d891c777a30617 Mon Sep 17 00:00:00 2001
From: Oleg Roschupkin <jjahson@gmail.com>
Date: Thu, 1 Mar 2012 14:05:43 +0900
Subject: [PATCH] Update inner navigation code. Closes issues #4 and #58.

---
 en.htm                         | 12 ++++++------
 scripts/script.js              | 12 ++++++------
 themes/ribbon/styles/style.css |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/en.htm b/en.htm
index 7dd6c35..2ffe541 100755
--- a/en.htm
+++ b/en.htm
@@ -176,11 +176,11 @@
 			<header>
 				<h2>Inner Navigation</h2>
 			</header>
-			<ol class="inner">
-				<li class="active">This tool is provided</li>
-				<li>Without warranty, guarantee</li>
-				<li>Or much in the way of explanation
-				<li>Erase your hard drive.</li>
+			<ol>
+				<li>This tool is provided</li>
+				<li class="next">Without warranty, guarantee</li>
+				<li class="next">Or much in the way of explanation
+				<li class="next">Erase your hard drive.</li>
 			</ol>
 		</section>
 	</div></div>
@@ -207,4 +207,4 @@
 	<!-- Copyright © 2010–2012 Vadim Makeev — pepelsbey.net -->
 	<!-- Photos by John Carey — fiftyfootshadows.net -->
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/scripts/script.js b/scripts/script.js
index 159ebca..5cc5967 100755
--- a/scripts/script.js
+++ b/scripts/script.js
@@ -9,7 +9,7 @@
 	for (i = 0; i < l; i++) {
 		slideList.push({
 			id: slides[i].id,
-			hasInnerNavigation: null !== slides[i].querySelector('.inner')
+			hasInnerNavigation: null !== slides[i].querySelector('.next')
 		});
 	}
 
@@ -127,13 +127,13 @@
 		// Shortcut for slides without inner navigation
 		if (true !== slideList[slideNumber].hasInnerNavigation) { return -1; }
 
-		var activeNodes = document.querySelectorAll(getSlideHash(slideNumber) + ' .active'),
-			// NOTE: we assume there is no other elements in inner navigation
-			node = activeNodes[activeNodes.length - 1].nextElementSibling;
+		var nextNodes = document.querySelectorAll(getSlideHash(slideNumber) + ' .next:not(.active)'),
+			node;
 
-		if (null !== node) {
+		if (0 !== nextNodes.length) {
+			node = nextNodes[0];
 			node.classList.add('active');
-			return activeNodes.length + 1;
+			return nextNodes.length - 1;
 		} else {
 			return -1;
 		}
diff --git a/themes/ribbon/styles/style.css b/themes/ribbon/styles/style.css
index 23b0e6a..7638f7e 100644
--- a/themes/ribbon/styles/style.css
+++ b/themes/ribbon/styles/style.css
@@ -394,10 +394,10 @@ BODY {
 				}
 
 /* Inner Navigation */
-.full .inner > * {
+.full .next {
 	opacity:0;
 	}
-.full .inner > .active {
+.full .next.active {
 	opacity:1;
 	-webkit-transition:opacity 0.5s linear;
 	-moz-transition:opacity 0.5s linear;
@@ -428,4 +428,4 @@ BODY {
 		}
 .full .progress-off {
 	z-index:1;
-	}
\ No newline at end of file
+	}