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

Merge pull request #109 from miripiruni/master 

Fix for #90 + Small JSDoc changes
This commit is contained in:
Vadim Makeev 2013-01-20 02:34:31 -08:00
parent 7e367d8e7f 37ffb1ea13
commit 78327bf41c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shower.js
View File

@ -71,7 +71,7 @@ window.shower = (function(window, document, undefined) {
/** /**
* Check if arg is number. * Check if arg is number.
* @private * @private
* @param {Number|whatelse} arg Any type * @param {String|Number} arg
* @returns {Boolean} * @returns {Boolean}
*/ */
shower._isNumber = function(arg) { shower._isNumber = function(arg) {
@ -165,7 +165,7 @@ window.shower = (function(window, document, undefined) {
*/ */
shower.next = function(callback) { shower.next = function(callback) {
var currentSlideNumber = shower.getCurrentSlideNumber(), var currentSlideNumber = shower.getCurrentSlideNumber(),
ret; ret = false;
// Only go to next slide if current slide have no inner // Only go to next slide if current slide have no inner
// navigation or inner navigation is fully shown // navigation or inner navigation is fully shown
@ -182,8 +182,6 @@ window.shower = (function(window, document, undefined) {
if (typeof(callback) === 'function') { if (typeof(callback) === 'function') {
callback(); callback();
} }
} else {
ret = false;
} }
return ret; return ret;
@ -197,7 +195,7 @@ window.shower = (function(window, document, undefined) {
*/ */
shower.previous = function(callback) { shower.previous = function(callback) {
var currentSlideNumber = shower.getCurrentSlideNumber(), var currentSlideNumber = shower.getCurrentSlideNumber(),
ret; ret = false;
// slides starts from 0 // slides starts from 0
if (currentSlideNumber > 0) { if (currentSlideNumber > 0) {
@ -207,8 +205,6 @@ window.shower = (function(window, document, undefined) {
if (typeof(callback) === 'function') { if (typeof(callback) === 'function') {
callback(); callback();
} }
} else {
ret = false;
} }
return ret; return ret;
@ -242,7 +238,7 @@ window.shower = (function(window, document, undefined) {
/** /**
* Switch to slide view. * Switch to slide view.
* @param {Function} [callback] runs only if shower.enterSlideMode() complete successfully * @param {Function} [callback] runs only if shower.enterSlideMode() complete successfully
* @returns {Number|Boolean} * @returns {Boolean}
*/ */
shower.enterSlideMode = function(callback) { shower.enterSlideMode = function(callback) {
var currentSlideNumber = shower.getCurrentSlideNumber(); var currentSlideNumber = shower.getCurrentSlideNumber();
@ -574,7 +570,7 @@ window.shower = (function(window, document, undefined) {
// Event handlers // Event handlers
window.addEventListener('DOMContentLoaded', function() { window.addEventListener('DOMContentLoaded', function() {
if (shower.isSlideMode()) { if (body.classList.contains('full')) {
shower.enterSlideMode(); shower.enterSlideMode();
} }
}, false); }, false);