浏览代码

prefer scaling over zooming on mobile devices

Hakim El Hattab 11 年之前
父节点
当前提交
02725cf728
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      js/reveal.js

+ 3 - 3
js/reveal.js

@@ -268,7 +268,7 @@
 
 		features.canvas = !!document.createElement( 'canvas' ).getContext;
 
-		isMobileDevice = navigator.userAgent.match( /(iphone|ipod|android)/gi );
+		isMobileDevice = navigator.userAgent.match( /(iphone|ipod|ipad|android)/gi );
 
 	}
 
@@ -1244,8 +1244,8 @@
 			scale = Math.max( scale, config.minScale );
 			scale = Math.min( scale, config.maxScale );
 
-			// Prefer zooming in WebKit so that content remains crisp
-			if( /webkit/i.test( navigator.userAgent ) && typeof dom.slides.style.zoom !== 'undefined' ) {
+			// Prefer zooming in desktop WebKit so that content remains crisp
+			if( !isMobileDevice && /webkit/i.test( navigator.userAgent ) && typeof dom.slides.style.zoom !== 'undefined' ) {
 				dom.slides.style.zoom = scale;
 			}
 			// Apply scale transform as a fallback