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

Merge branch '1549' of https://github.com/RopoMen/reveal.js into dev

This commit is contained in:
Hakim El Hattab 2016-04-13 15:26:06 +02:00
parent 5dd9067150 a63c8cab92
commit f0ee41a22d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/reveal.js
View File

@ -32,6 +32,7 @@
HORIZONTAL_SLIDES_SELECTOR = '.slides>section', HORIZONTAL_SLIDES_SELECTOR = '.slides>section',
VERTICAL_SLIDES_SELECTOR = '.slides>section.present>section', VERTICAL_SLIDES_SELECTOR = '.slides>section.present>section',
HOME_SLIDE_SELECTOR = '.slides>section:first-of-type', HOME_SLIDE_SELECTOR = '.slides>section:first-of-type',
UA = navigator.userAgent,
// Configuration defaults, can be overridden at initialization time // Configuration defaults, can be overridden at initialization time
config = { config = {
@ -201,6 +202,9 @@
// Client is a mobile device, see #checkCapabilities() // Client is a mobile device, see #checkCapabilities()
isMobileDevice, isMobileDevice,
// Client is a desktop Chrome, see #checkCapabilities()
isChrome,
// Throttles mouse wheel navigation // Throttles mouse wheel navigation
lastMouseWheelStep = 0, lastMouseWheelStep = 0,
@ -305,7 +309,8 @@
*/ */
function checkCapabilities() { function checkCapabilities() {
isMobileDevice = /(iphone|ipod|ipad|android)/gi.test( navigator.userAgent ); isMobileDevice = /(iphone|ipod|ipad|android)/gi.test( UA );
isChrome = /chrome/i.test( UA ) && !/edge/i.test( UA );
var testElement = document.createElement( 'div' ); var testElement = document.createElement( 'div' );
@ -328,13 +333,13 @@
// Transitions in the overview are disabled in desktop and // Transitions in the overview are disabled in desktop and
// Safari due to lag // Safari due to lag
features.overviewTransitions = !/Version\/[\d\.]+.*Safari/.test( navigator.userAgent ); features.overviewTransitions = !/Version\/[\d\.]+.*Safari/.test( UA );
// Flags if we should use zoom instead of transform to scale // Flags if we should use zoom instead of transform to scale
// up slides. Zoom produces crisper results but has a lot of // up slides. Zoom produces crisper results but has a lot of
// xbrowser quirks so we only use it in whitelsited browsers. // xbrowser quirks so we only use it in whitelsited browsers.
features.zoom = 'zoom' in testElement.style && !isMobileDevice && features.zoom = 'zoom' in testElement.style && !isMobileDevice &&
( /chrome/i.test( navigator.userAgent ) || /Version\/[\d\.]+.*Safari/.test( navigator.userAgent ) ); ( isChrome || /Version\/[\d\.]+.*Safari/.test( UA ) );
} }
@ -1052,7 +1057,7 @@
// Only support touch for Android, fixes double navigations in // Only support touch for Android, fixes double navigations in
// stock browser // stock browser
if( navigator.userAgent.match( /android/gi ) ) { if( UA.match( /android/gi ) ) {
pointerEvents = [ 'touchstart' ]; pointerEvents = [ 'touchstart' ];
} }
@ -4180,7 +4185,7 @@
} }
// There's a bug with swiping on some Android devices unless // There's a bug with swiping on some Android devices unless
// the default action is always prevented // the default action is always prevented
else if( navigator.userAgent.match( /android/gi ) ) { else if( UA.match( /android/gi ) ) {
event.preventDefault(); event.preventDefault();
} }