Skip to content

Commit

Permalink
tweaks to showSlideNumber config hakimel#1833
Browse files Browse the repository at this point in the history
  • Loading branch information
hakimel committed Feb 20, 2017
1 parent 3d23e26 commit 6c06564
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -767,10 +767,11 @@ Reveal.configure({ slideNumber: true });
// "c/t": flattened slide number / total slides
Reveal.configure({ slideNumber: 'c/t' });

// Control which views the slide number displays on using the "showSlideNumber" value.
// "all": show on all views (default)
// "notes": only show slide numbers on speaker notes view
Reveal.configure({ showSlideNumber: 'notes' });
// Control which views the slide number displays on using the "showSlideNumber" value:
// "all": show on all views (default)
// "speaker": only show slide numbers on speaker notes view
// "print": only show slide numbers when printing to PDF
Reveal.configure({ showSlideNumber: 'speaker' });

```

Expand Down
29 changes: 15 additions & 14 deletions js/reveal.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

// Display the page number of the current slide
slideNumber: false,

// Determine which displays to show the slide number on
showSlideNumber: 'all',

Expand Down Expand Up @@ -701,7 +701,7 @@
}

// Inject slide numbers if `slideNumbers` are enabled
if( config.slideNumber ) {
if( config.slideNumber && /all|print/i.test( config.showSlideNumber ) ) {
var slideNumberH = parseInt( slide.getAttribute( 'data-index-h' ), 10 ) + 1,
slideNumberV = parseInt( slide.getAttribute( 'data-index-v' ), 10 ) + 1;

Expand Down Expand Up @@ -984,18 +984,6 @@

dom.controls.style.display = config.controls ? 'block' : 'none';
dom.progress.style.display = config.progress ? 'block' : 'none';

var slideNumberDisplay = 'none';
if (config.slideNumber && !isPrintingPDF()) {
if (config.showSlideNumber === 'all') {
slideNumberDisplay = 'block';
}
else if (config.showSlideNumber === 'notes' && isSpeakerNotes()) {
slideNumberDisplay = 'block';
}
}

dom.slideNumber.style.display = slideNumberDisplay;

if( config.shuffle ) {
shuffle();
Expand Down Expand Up @@ -1079,6 +1067,19 @@
} );
}

// Slide numbers
var slideNumberDisplay = 'none';
if( config.slideNumber && !isPrintingPDF() ) {
if( config.showSlideNumber === 'all' ) {
slideNumberDisplay = 'block';
}
else if( config.showSlideNumber === 'speaker' && isSpeakerNotes() ) {
slideNumberDisplay = 'block';
}
}

dom.slideNumber.style.display = slideNumberDisplay;

sync();

}
Expand Down

0 comments on commit 6c06564

Please sign in to comment.