xobs
/
fa20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a slide argument to locationHash(), getSlidePastCount()

This commit is contained in:
Dougal J. Sutherland 2019-03-02 09:18:31 -08:00
parent f9affb550a
commit 1cf5ffe029
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js/reveal.js
View File

@ -2652,34 +2652,37 @@
} }
/** /**
* Return a hash URL that will resolve to the current slide location. * Return a hash URL that will resolve to the given slide location.
*
* @param {HTMLElement} [slide=currentSlide] The slide to link to
*/ */
function locationHash() { function locationHash( slide ) {
var url = '/'; var url = '/';
// Attempt to create a named link based on the slide's ID // Attempt to create a named link based on the slide's ID
var id = currentSlide ? currentSlide.getAttribute( 'id' ) : null; var s = slide || currentSlide;
var id = s ? s.getAttribute( 'id' ) : null;
if( id ) { if( id ) {
id = encodeURIComponent( id ); id = encodeURIComponent( id );
} }
var indexf; var index = getIndices( slide );
if( config.fragmentInURL ) { if( !config.fragmentInURL ) {
indexf = getIndices().f; index.f = undefined;
} }
// If the current slide has an ID, use that as a named link, // If the current slide has an ID, use that as a named link,
// but we don't support named links with a fragment index // but we don't support named links with a fragment index
if( typeof id === 'string' && id.length && indexf === undefined ) { if( typeof id === 'string' && id.length && index.f === undefined ) {
url = '/' + id; url = '/' + id;
} }
// Otherwise use the /h/v index // Otherwise use the /h/v index
else { else {
var hashIndexBase = config.hashOneBasedIndex ? 1 : 0; var hashIndexBase = config.hashOneBasedIndex ? 1 : 0;
if( indexh > 0 || indexv > 0 || indexf !== undefined ) url += indexh + hashIndexBase; if( index.h > 0 || index.v > 0 || index.f !== undefined ) url += index.h + hashIndexBase;
if( indexv > 0 || indexf !== undefined ) url += '/' + (indexv + hashIndexBase ); if( index.v > 0 || index.f !== undefined ) url += '/' + (index.v + hashIndexBase );
if( indexf !== undefined ) url += '/' + indexf; if( index.f !== undefined ) url += '/' + index.f;
} }
return url; return url;
@ -4225,9 +4228,15 @@
* Returns the number of past slides. This can be used as a global * Returns the number of past slides. This can be used as a global
* flattened index for slides. * flattened index for slides.
* *
* @param {HTMLElement} [slide=currentSlide] The slide we're counting before
*
* @return {number} Past slide count * @return {number} Past slide count
*/ */
function getSlidePastCount() { function getSlidePastCount( slide ) {
if( slide === undefined ) {
slide = currentSlide;
}
var horizontalSlides = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) ); var horizontalSlides = toArray( dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) );
@ -4243,7 +4252,7 @@
for( var j = 0; j < verticalSlides.length; j++ ) { for( var j = 0; j < verticalSlides.length; j++ ) {
// Stop as soon as we arrive at the present // Stop as soon as we arrive at the present
if( verticalSlides[j].classList.contains( 'present' ) ) { if( verticalSlides[j] === slide ) {
break mainLoop; break mainLoop;
} }
@ -4252,7 +4261,7 @@
} }
// Stop as soon as we arrive at the present // Stop as soon as we arrive at the present
if( horizontalSlide.classList.contains( 'present' ) ) { if( horizontalSlide === slide ) {
break; break;
} }