From b143e5976bd3dbc5445a27052a93ab6f060b361b Mon Sep 17 00:00:00 2001
From: Hakim El Hattab <hakim.elhattab@gmail.com>
Date: Mon, 20 Feb 2017 11:49:19 +0100
Subject: tweaks to showSlideNumber config #1833

---
 js/reveal.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'js')

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();
 
 	}
-- 
cgit v1.2.3