ivan-igorevich
/
bmstu-mt-wp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Non-existent slide id leads to the first slide

This commit is contained in:
Tony Ganch 2014-02-17 18:59:51 +04:00
parent 71aa70ec58
commit 7e3b56acd0
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
shower.js
View File

@ -599,13 +599,18 @@ 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 there is no slide number in url, return -1.
* If there is a slide number in url, but the slide does not exist, return 0.
* @returns {Number}
*/
shower.getCurrentSlideNumber = function() {
var i = shower.slideList.length - 1,
currentSlideId = url.hash.substr(1);
if (currentSlideId === '') {
return -1;
}
// As fast as you can ;-)
// http://jsperf.com/for-vs-foreach/46
for (; i >= 0; --i) {
@ -614,7 +619,7 @@ window.shower = window.shower || (function(window, document, undefined) {
}
}
return -1;
return 0;
};
/**
@ -809,13 +814,27 @@ window.shower = window.shower || (function(window, document, undefined) {
// Event handlers
window.addEventListener('DOMContentLoaded', function() {
if (body.classList.contains('full') || shower.isSlideMode()) {
shower.go(shower.getCurrentSlideNumber());
var currentSlideNumber = shower.getCurrentSlideNumber(),
isSlideMode = body.classList.contains('full') || shower.isSlideMode();
if (currentSlideNumber === -1 && isSlideMode) {
shower.go(0);
} else if (currentSlideNumber === 0 || isSlideMode) {
shower.go(currentSlideNumber);
}
if (isSlideMode) {
shower.enterSlideMode();
}
}, false);
window.addEventListener('popstate', function() {
var currentSlideNumber = shower.getCurrentSlideNumber();
if (currentSlideNumber !== -1) {
shower.go(currentSlideNumber);
}
if (shower.isListMode()) {
shower.enterListMode();
} else {

2
shower.min.js vendored
View File

File diff suppressed because one or more lines are too long