Rename: innerNavigationCompleted -> isInnerNavCompleted

This commit is contained in:
miripiruni 2013-01-20 16:08:48 +04:00
parent 78fbef6280
commit a06c84a0b3
1 changed files with 5 additions and 6 deletions

View File

@ -595,7 +595,7 @@ window.shower = (function(window, document, undefined) {
if (e.altKey || e.ctrlKey || e.metaKey) { return; } if (e.altKey || e.ctrlKey || e.metaKey) { return; }
var currentSlideNumber = shower.getCurrentSlideNumber(), var currentSlideNumber = shower.getCurrentSlideNumber(),
innerNavigationCompleted = true; isInnerNavCompleted = true;
switch (e.which) { switch (e.which) {
case 116: // F5 case 116: // F5
@ -644,20 +644,19 @@ window.shower = (function(window, document, undefined) {
if (shower.isSlideMode()) { if (shower.isSlideMode()) {
// Inner navigation is "completed" if current slide have // Inner navigation is "completed" if current slide have
// no inner navigation or inner navigation is fully shown // no inner navigation or inner navigation is fully shown
innerNavigationCompleted = !slideList[currentSlideNumber].hasInnerNavigation || isInnerNavCompleted = !slideList[currentSlideNumber].hasInnerNavigation ||
-1 === shower.increaseInnerNavigation(currentSlideNumber); -1 === shower.increaseInnerNavigation(currentSlideNumber);
} else { } else {
// Also inner navigation is always "completed" if we are in // Also inner navigation is always "completed" if we are in
// list mode // list mode
innerNavigationCompleted = true; isInnerNavCompleted = true;
} }
// NOTE: First of all check if there is no current slide
if ( if (
-1 === currentSlideNumber || innerNavigationCompleted -1 === currentSlideNumber || isInnerNavCompleted
) { ) {
currentSlideNumber++; currentSlideNumber++;
shower.go(currentSlideNumber); shower.go(currentSlideNumber);
// We must run slideshow only in full mode
if (shower.isSlideMode()) { if (shower.isSlideMode()) {
shower.runInnerNavigation(currentSlideNumber); shower.runInnerNavigation(currentSlideNumber);
} }