Skip to content

Commit

Permalink
Merge branch 'slidenum' of https://github.com/malcomio/reveal.js into…
Browse files Browse the repository at this point in the history
… dev
  • Loading branch information
hakimel committed Feb 20, 2017
2 parents 5565d08 + 95bca84 commit 8f7e4bf
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ By default, Reveal is configured with [highlight.js](https://highlightjs.org/) f
```

### Slide number
If you would like to display the page number of the current slide you can do so using the ```slideNumber``` configuration value.
If you would like to display the page number of the current slide you can do so using the ```slideNumber``` and ```showSlideNumber``` configuration values.

```javascript
// Shows the slide number using default formatting
Expand All @@ -767,6 +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' });

```


Expand Down
16 changes: 15 additions & 1 deletion js/reveal.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@

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

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

// Push each slide change to the browser history
history: false,
Expand Down Expand Up @@ -981,7 +984,18 @@

dom.controls.style.display = config.controls ? 'block' : 'none';
dom.progress.style.display = config.progress ? 'block' : 'none';
dom.slideNumber.style.display = config.slideNumber && !isPrintingPDF() ? '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

0 comments on commit 8f7e4bf

Please sign in to comment.