Fix the getCurrentSlideNumber to return 0 when it fails to find a slide, fixes #152
This commit is contained in:
parent
31d7411198
commit
0930bb94d2
13
shower.js
13
shower.js
|
@ -599,7 +599,7 @@ window.shower = window.shower || (function(window, document, undefined) {
|
|||
/**
|
||||
* Get current slide number. Starts from zero. Warning: when you have
|
||||
* slide number 1 in URL this method will return 0.
|
||||
* If something is wrong return -1.
|
||||
* If something is wrong return 0 to get the first slide.
|
||||
* @returns {Number}
|
||||
*/
|
||||
shower.getCurrentSlideNumber = function() {
|
||||
|
@ -614,7 +614,7 @@ window.shower = window.shower || (function(window, document, undefined) {
|
|||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
return 0;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -634,11 +634,6 @@ window.shower = window.shower || (function(window, document, undefined) {
|
|||
throw new Error('You can\'t scroll to because you in slide mode. Please, switch to list mode.');
|
||||
}
|
||||
|
||||
// @TODO: WTF?
|
||||
if (-1 === slideNumber) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (shower.slideList[slideNumber]) {
|
||||
currentSlide = document.getElementById(shower.slideList[slideNumber].id);
|
||||
window.scrollTo(0, currentSlide.offsetTop);
|
||||
|
@ -799,7 +794,7 @@ window.shower = window.shower || (function(window, document, undefined) {
|
|||
|
||||
document.addEventListener('keydown', function(e) {
|
||||
var currentSlideNumber = shower.getCurrentSlideNumber(),
|
||||
slide = shower.slideList[ currentSlideNumber !== -1 ? currentSlideNumber : 0 ],
|
||||
slide = shower.slideList[currentSlideNumber],
|
||||
slideNumber;
|
||||
|
||||
switch (e.which) {
|
||||
|
@ -833,7 +828,7 @@ window.shower = window.shower || (function(window, document, undefined) {
|
|||
break;
|
||||
|
||||
case 13: // Enter
|
||||
if (shower.isListMode() && -1 !== currentSlideNumber) {
|
||||
if (shower.isListMode()) {
|
||||
e.preventDefault();
|
||||
|
||||
shower.enterSlideMode();
|
||||
|
|
Loading…
Reference in New Issue