aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2017-02-20 11:49:19 +0100
committerHakim El Hattab <hakim.elhattab@gmail.com>2017-02-20 11:49:36 +0100
commitb143e5976bd3dbc5445a27052a93ab6f060b361b (patch)
tree1ae58f8fac2419db1ecc741a13c53f8591478df2
parent8f7e4bfd418d2c7fb74c477bf4516861b3bc0d71 (diff)
downloadfosdem-2018-presentation-b143e5976bd3dbc5445a27052a93ab6f060b361b.tar
fosdem-2018-presentation-b143e5976bd3dbc5445a27052a93ab6f060b361b.tar.gz
tweaks to showSlideNumber config #1833
-rw-r--r--README.md9
-rw-r--r--js/reveal.js29
2 files changed, 20 insertions, 18 deletions
diff --git a/README.md b/README.md
index e711dd0..789a8fa 100644
--- a/README.md
+++ b/README.md
@@ -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' });
```
diff --git a/js/reveal.js b/js/reveal.js
index b48620b..65560a6 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -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',
@@ -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;
@@ -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();
@@ -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();
}