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

Merge branch 'fragment-in-url' of https://github.com/dougalsutherland/reveal.js into dev

This commit is contained in:
Hakim El Hattab 2018-02-07 10:33:19 +01:00
parent 4dabd439d2 d68423f310
commit 5eba331935
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -228,6 +228,10 @@ Reveal.initialize({
// Turns fragments on and off globally // Turns fragments on and off globally
fragments: true, fragments: true,
// Flags whether to include the current fragment in the URL,
// so that reloading brings you to the same fragment position
fragmentInURL: false,
// Flags if the presentation is running in an embedded mode, // Flags if the presentation is running in an embedded mode,
// i.e. contained within a limited portion of the screen // i.e. contained within a limited portion of the screen
embedded: false, embedded: false,

35
js/reveal.js
View File

@ -102,6 +102,10 @@
// Turns fragments on and off globally // Turns fragments on and off globally
fragments: true, fragments: true,
// Flags whether to include the current fragment in the URL,
// so that reloading brings you to the same fragment position
fragmentInURL: false,
// Flags if the presentation is running in an embedded mode, // Flags if the presentation is running in an embedded mode,
// i.e. contained within a limited portion of the screen // i.e. contained within a limited portion of the screen
embedded: false, embedded: false,
@ -3757,10 +3761,17 @@
else { else {
// Read the index components of the hash // Read the index components of the hash
var h = parseInt( bits[0], 10 ) || 0, var h = parseInt( bits[0], 10 ) || 0,
v = parseInt( bits[1], 10 ) || 0; v = parseInt( bits[1], 10 ) || 0,
f;
if( config.fragmentInURL ) {
f = parseInt( bits[2], 10 );
if( isNaN( f ) ) {
f = undefined;
}
}
if( h !== indexh || v !== indexv ) { if( h !== indexh || v !== indexv || f !== undefined ) {
slide( h, v ); slide( h, v, f );
} }
} }
@ -3793,14 +3804,21 @@
id = id.replace( /[^a-zA-Z0-9\-\_\:\.]/g, '' ); id = id.replace( /[^a-zA-Z0-9\-\_\:\.]/g, '' );
} }
// If the current slide has an ID, use that as a named link var indexf;
if( typeof id === 'string' && id.length ) { if( config.fragmentInURL ) {
indexf = getIndices().f;
}
// If the current slide has an ID, use that as a named link,
// but we don't support named links with a fragment index
if( typeof id === 'string' && id.length && indexf === undefined ) {
url = '/' + id; url = '/' + id;
} }
// Otherwise use the /h/v index // Otherwise use the /h/v index
else { else {
if( indexh > 0 || indexv > 0 ) url += indexh; if( indexh > 0 || indexv > 0 || indexf !== undefined ) url += indexh;
if( indexv > 0 ) url += '/' + indexv; if( indexv > 0 || indexf !== undefined ) url += '/' + indexv;
if( indexf !== undefined ) url += '/' + indexf;
} }
window.location.hash = url; window.location.hash = url;
@ -4138,6 +4156,9 @@
updateControls(); updateControls();
updateProgress(); updateProgress();
if( config.fragmentInURL ) {
writeURL();
}
return !!( fragmentsShown.length || fragmentsHidden.length ); return !!( fragmentsShown.length || fragmentsHidden.length );