jan/revproxy-presentation
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't write '#/' to url on first slide, remove history api feature detection

Browse source
This commit is contained in:
Hakim El Hattab 2020-06-02 09:08:00 +02:00
parent 7ebade7248
commit c91074761a
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
js/controllers/location.js
View file

@ -1,5 +1,3 @@
import { supportsHistoryAPI } from '../utils/device.js'
/**
* Reads and writes the URL based on reveal.js' current state.
*/
@ -121,15 +119,24 @@ export default class Location {
this.writeURLTimeout = setTimeout( this.writeURL, delay );
}
else if( currentSlide ) {
let hash = this.getHash();
// If we're configured to push to history OR the history
// API is not avaialble.
if( config.history || supportsHistoryAPI === false ) {
window.location.hash = this.getHash();
if( config.history ) {
window.location.hash = hash;
}
// If we're configured to reflect the current slide in the
// URL without pushing to history.
else if( config.hash ) {
window.history.replaceState( null, null, '#' + this.getHash() );
// If the hash is empty, don't add it to the URL
if( hash === '/' ) {
window.history.replaceState( null, null, window.location.pathname + window.location.search );
}
else {
window.history.replaceState( null, null, '#' + hash );
}
}
// UPDATE: The below nuking of all hash changes breaks
// anchors on pages where reveal.js is running. Removed
@ -141,6 +148,7 @@ export default class Location {
// else {
// window.history.replaceState( null, null, window.location.pathname + window.location.search );
// }
}
}

4
js/utils/device.js
View file

@ -12,6 +12,4 @@ export const isAndroid = /android/gi.test( UA );
// up slides. Zoom produces crisper results but has a lot of
// xbrowser quirks so we only use it in whitelisted browsers.
export const supportsZoom = 'zoom' in testElement.style && !isMobile &&
( isChrome || /Version\/[\d\.]+.*Safari/.test( UA ) );
export const supportsHistoryAPI = typeof window.history.replaceState === 'function' && !/PhantomJS/.test( UA );
( isChrome || /Version\/[\d\.]+.*Safari/.test( UA ) );