xobs/fa23-si
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/bchretien/reveal.js into dev

Browse Source
This commit is contained in:
Hakim El Hattab 2015-03-25 14:39:24 +01:00
commit 2999b628cf
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/reveal.js
View File

@ -2476,11 +2476,12 @@
} }
var totalSlides = getTotalSlides(); var totalSlides = getTotalSlides();
var currentSlide = getSlidePastCount() + 1;
dom.slideNumber.innerHTML = format.replace( /h/g, indexh ) dom.slideNumber.innerHTML = format.replace( /h/g, indexh )
.replace( /v/g, indexv ) .replace( /v/g, indexv )
.replace( /c/g, Math.round( getProgress() * totalSlides ) + 1 ) .replace( /c/g, currentSlide )
.replace( /t/g, totalSlides + 1 ); .replace( /t/g, totalSlides );
} }
} }
@ -2966,15 +2967,14 @@
} }
/** /**
* Returns a value ranging from 0-1 that represents * Returns the number of past slides. This can be used as a global
* how far into the presentation we have navigated. * flattened index for slides.
*/ */
function getProgress() { function getSlidePastCount() {
var horizontalSlides = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) ); var horizontalSlides = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) );
// The number of past and total slides // The number of past slides
var totalCount = getTotalSlides();
var pastCount = 0; var pastCount = 0;
// Step through all slides and count the past ones // Step through all slides and count the past ones
@ -3006,6 +3006,20 @@
} }
return pastCount;
}
/**
* Returns a value ranging from 0-1 that represents
* how far into the presentation we have navigated.
*/
function getProgress() {
// The number of past and total slides
var totalCount = getTotalSlides();
var pastCount = getSlidePastCount();
if( currentSlide ) { if( currentSlide ) {
var allFragments = currentSlide.querySelectorAll( '.fragment' ); var allFragments = currentSlide.querySelectorAll( '.fragment' );