From 42babeb4ef68d2079824680abf11f94b89b17a9f Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 29 Oct 2015 12:39:51 +0100 Subject: [PATCH] one more slide number format --- README.md | 3 ++- js/reveal.js | 33 ++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4010005..18bb8b4 100644 --- a/README.md +++ b/README.md @@ -611,7 +611,8 @@ If you would like to display the page number of the current slide you can do so Reveal.configure({ slideNumber: true }); // Slide number formatting can be configured using these variables: -// "h/v": horizontal and vertical slide numbers (default) +// "h.v": horizontal . vertical slide number (default) +// "h/v": horizontal / vertical slide number // "c": flattened slide number // "c/t": flattened slide number / total slides Reveal.configure({ slideNumber: 'c/t' }); diff --git a/js/reveal.js b/js/reveal.js index f7811fe..e4b380c 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -609,7 +609,7 @@ var numberElement = document.createElement( 'div' ); numberElement.classList.add( 'slide-number' ); numberElement.classList.add( 'slide-number-pdf' ); - numberElement.innerHTML = formatSlideNumber( slideNumberH, '/', slideNumberV ); + numberElement.innerHTML = formatSlideNumber( slideNumberH, '.', slideNumberV ); background.appendChild( numberElement ); } } @@ -2538,7 +2538,8 @@ * Updates the slide number div to reflect the current slide. * * The following slide number formats are available: - * "h/v": horizontal and vertical slide numbers (default) + * "h.v": horizontal . vertical slide number (default) + * "h/v": horizontal / vertical slide number * "c": flattened slide number * "c/t": flattened slide number / total slides */ @@ -2548,25 +2549,27 @@ if( config.slideNumber && dom.slideNumber) { var value = []; - var format = 'h/v'; + var format = 'h.v'; // Check if a custom number format is available if( typeof config.slideNumber === 'string' ) { format = config.slideNumber; } - if( format === 'c' ) { - value.push( getSlidePastCount() + 1 ); - } - else if( format === 'c/t' ) { - value.push( getSlidePastCount() + 1, '/', getTotalSlides() ); - } - else { - value.push( indexh + 1 ); - - if( isVerticalSlide() ) { - value.push( '/', indexv + 1 ); - } + switch( format ) { + case 'c': + value.push( getSlidePastCount() + 1 ); + break; + case 'c/t': + value.push( getSlidePastCount() + 1, '/', getTotalSlides() ); + break; + case 'h/v': + value.push( indexh + 1 ); + if( isVerticalSlide() ) value.push( '/', indexv + 1 ); + break; + default: + value.push( indexh + 1 ); + if( isVerticalSlide() ) value.push( '.', indexv + 1 ); } dom.slideNumber.innerHTML = formatSlideNumber( value[0], value[1], value[2] );