Merge branch 'master' of https://github.com/linux-man/reveal.js into dev

1 files changed, 6 insertions, 23 deletions

diff --git a/plugin/zoom-js/zoom.js b/plugin/zoom-js/zoom.js
index 8738083..9e8629f 100644
--- a/plugin/zoom-js/zoom.js
+++ b/plugin/zoom-js/zoom.js
@@ -3,31 +3,17 @@
 	var isEnabled = true;
 
 	document.querySelector( '.reveal .slides' ).addEventListener( 'mousedown', function( event ) {
-		var modifier = ( Reveal.getConfig().zoomKey ? Reveal.getConfig().zoomKey : 'alt' ) + 'Key';
-
-		var zoomPadding = 20;
-		var revealScale = Reveal.getScale();
+		var modifier = ( Reveal.getConfig().zoomKey ? Reveal.getConfig().zoomKey : 'ctrl' ) + 'Key';
+		var zoomLevel = ( Reveal.getConfig().zoomLevel ? Reveal.getConfig().zoomLevel : 2 );
 
 		if( event[ modifier ] && isEnabled ) {
 			event.preventDefault();
 
-			var bounds;
-			var originalDisplay = event.target.style.display;
-
-			// Get the bounding rect of the contents, not the containing box
-			if( window.getComputedStyle( event.target ).display === 'block' ) {
-				event.target.style.display = 'inline-block';
-				bounds = event.target.getBoundingClientRect();
-				event.target.style.display = originalDisplay;
-			} else {
-				bounds = event.target.getBoundingClientRect();
-			}
-
 			zoom.to({
-				x: ( bounds.left * revealScale ) - zoomPadding,
-				y: ( bounds.top * revealScale ) - zoomPadding,
-				width: ( bounds.width * revealScale ) + ( zoomPadding * 2 ),
-				height: ( bounds.height * revealScale ) + ( zoomPadding * 2 ),
+				x: event.clientX - window.innerWidth / (zoomLevel * 2),
+				y: event.clientY - window.innerHeight / (zoomLevel * 2),
+				width: window.innerWidth / zoomLevel,
+				height: window.innerHeight / zoomLevel,
 				pan: false
 			});
 		}
@@ -283,6 +269,3 @@ var zoom = (function(){
 	}
 
 })();
-
-
-