From 2a57223939cde0680b37cc333e67f42130f73984 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Mon, 16 Apr 2018 09:58:03 +0200 Subject: [PATCH] revise readURL to handle one-based indices --- js/reveal.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index 477a1ea2c06..ebdeb9f6023 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -2281,8 +2281,9 @@ } // Otherwise use the /h/v index else { - if( indexh > 0 || indexv > 0 || indexf !== undefined ) url += indexh + config.hashOneBasedIndex; - if( indexv > 0 || indexf !== undefined ) url += '/' + (indexv + config.hashOneBasedIndex); + var hashIndexBase = config.hashOneBasedIndex ? 1 : 0; + if( indexh > 0 || indexv > 0 || indexf !== undefined ) url += indexh + hashIndexBase; + if( indexv > 0 || indexf !== undefined ) url += '/' + (indexv + hashIndexBase ); if( indexf !== undefined ) url += '/' + indexf; } @@ -3839,9 +3840,11 @@ } } else { + var hashIndexBase = config.hashOneBasedIndex ? 1 : 0; + // Read the index components of the hash - var h = parseInt( bits[0], 10 ) || 0 - config.hashOneBasedIndex, - v = parseInt( bits[1], 10 ) || 0 - config.hashOneBasedIndex, + var h = ( parseInt( bits[0], 10 ) - hashIndexBase ) || 0, + v = ( parseInt( bits[1], 10 ) - hashIndexBase ) || 0, f; if( config.fragmentInURL ) {