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

tweaks to showSlideNumber config #1833

This commit is contained in:
Hakim El Hattab 2017-02-20 11:49:19 +01:00
parent 8f7e4bfd41
commit b143e5976b
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -767,10 +767,11 @@ Reveal.configure({ slideNumber: true });
// "c/t": flattened slide number / total slides // "c/t": flattened slide number / total slides
Reveal.configure({ slideNumber: 'c/t' }); Reveal.configure({ slideNumber: 'c/t' });
// Control which views the slide number displays on using the "showSlideNumber" value. // Control which views the slide number displays on using the "showSlideNumber" value:
// "all": show on all views (default) // "all": show on all views (default)
// "notes": only show slide numbers on speaker notes view // "speaker": only show slide numbers on speaker notes view
Reveal.configure({ showSlideNumber: 'notes' }); // "print": only show slide numbers when printing to PDF
Reveal.configure({ showSlideNumber: 'speaker' });
``` ```

29
js/reveal.js
View File

@ -57,7 +57,7 @@
// Display the page number of the current slide // Display the page number of the current slide
slideNumber: false, slideNumber: false,
// Determine which displays to show the slide number on // Determine which displays to show the slide number on
showSlideNumber: 'all', showSlideNumber: 'all',
@ -701,7 +701,7 @@
} }
// Inject slide numbers if `slideNumbers` are enabled // 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, var slideNumberH = parseInt( slide.getAttribute( 'data-index-h' ), 10 ) + 1,
slideNumberV = parseInt( slide.getAttribute( 'data-index-v' ), 10 ) + 1; slideNumberV = parseInt( slide.getAttribute( 'data-index-v' ), 10 ) + 1;
@ -984,18 +984,6 @@
dom.controls.style.display = config.controls ? 'block' : 'none'; dom.controls.style.display = config.controls ? 'block' : 'none';
dom.progress.style.display = config.progress ? '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 ) { if( config.shuffle ) {
shuffle(); shuffle();
@ -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(); sync();
} }