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

Merge pull request #110 from miripiruni/master 

Rename shower.runSlideshowIfPresented()
This commit is contained in:
Vadim Makeev 2013-01-20 02:56:50 -08:00
parent 49b842b357 f65f61bef5
commit 4e6e4be708
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shower.js
View File

@ -263,7 +263,7 @@ window.shower = (function(window, document, undefined) {
shower.updateProgress(currentSlideNumber); shower.updateProgress(currentSlideNumber);
shower.updateCurrentAndPassedSlides(currentSlideNumber); shower.updateCurrentAndPassedSlides(currentSlideNumber);
shower.runSlideshowIfPresented(currentSlideNumber); shower.runInnerNavigation(currentSlideNumber);
if (typeof(callback) === 'function') { if (typeof(callback) === 'function') {
callback(); callback();
@ -511,7 +511,7 @@ window.shower = (function(window, document, undefined) {
* @param {Number} slideNumber * @param {Number} slideNumber
* @returns {Boolean} * @returns {Boolean}
*/ */
shower.runSlideshowIfPresented = function(slideNumber) { shower.runInnerNavigation = function(slideNumber) {
if ( ! shower._isNumber(slideNumber)) { if ( ! shower._isNumber(slideNumber)) {
throw new Error('Gimme slide number as Number, baby!'); throw new Error('Gimme slide number as Number, baby!');
} }
@ -528,7 +528,7 @@ window.shower = (function(window, document, undefined) {
timer = setTimeout(function() { timer = setTimeout(function() {
shower.go(slideNumber + 1); shower.go(slideNumber + 1);
shower.runSlideshowIfPresented(slideNumber + 1); shower.runInnerNavigation(slideNumber + 1);
}, },
timing); timing);
} }
@ -658,7 +658,7 @@ window.shower = (function(window, document, undefined) {
shower.go(currentSlideNumber); shower.go(currentSlideNumber);
// We must run slideshow only in full mode // We must run slideshow only in full mode
if (shower.isSlideMode()) { if (shower.isSlideMode()) {
shower.runSlideshowIfPresented(currentSlideNumber); shower.runInnerNavigation(currentSlideNumber);
} }
} }
break; break;