Skip to content

Commit 080fb3c

Browse files
committed
disable zoom plugin while in overview mode
1 parent c21e6bb commit 080fb3c

File tree

1 file changed

+26
-21
lines changed

1 file changed

+26
-21
lines changed

plugin/zoom-js/zoom.js

+26-21
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,34 @@
11
// Custom reveal.js integration
22
(function(){
3-
document.querySelector( '.reveal' ).addEventListener( 'click', function( event ) {
4-
if( event.altKey ) {
3+
var isEnabled = true;
4+
5+
document.querySelector( '.reveal' ).addEventListener( 'mousedown', function( event ) {
6+
if( event.altKey && isEnabled ) {
57
event.preventDefault();
68
zoom.to({ element: event.target, pan: false });
79
}
810
} );
11+
12+
Reveal.addEventListener( 'overviewshown', function() { isEnabled = false; } );
13+
Reveal.addEventListener( 'overviewhidden', function() { isEnabled = true; } );
914
})();
1015

1116
/*!
1217
* zoom.js 0.2 (modified version for use with reveal.js)
1318
* http://lab.hakim.se/zoom-js
1419
* MIT licensed
15-
*
20+
*
1621
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
1722
*/
1823
var zoom = (function(){
1924

2025
// The current zoom level (scale)
2126
var level = 1;
22-
27+
2328
// The current mouse position, used for panning
2429
var mouseX = 0,
2530
mouseY = 0;
26-
31+
2732
// Timeout before pan is activated
2833
var panEngageTimeout = -1,
2934
panUpdateInterval = -1;
@@ -36,7 +41,7 @@ var zoom = (function(){
3641
'msTransform' in document.body.style ||
3742
'OTransform' in document.body.style ||
3843
'transform' in document.body.style;
39-
44+
4045
if( supportsTransforms ) {
4146
// The easing that will be applied when we zoom in/out
4247
document.body.style.transition = 'transform 0.8s ease';
@@ -45,7 +50,7 @@ var zoom = (function(){
4550
document.body.style.MozTransition = '-moz-transform 0.8s ease';
4651
document.body.style.WebkitTransition = '-webkit-transform 0.8s ease';
4752
}
48-
53+
4954
// Zoom out if the user hits escape
5055
document.addEventListener( 'keyup', function( event ) {
5156
if( level !== 1 && event.keyCode === 27 ) {
@@ -62,21 +67,21 @@ var zoom = (function(){
6267
}, false );
6368

6469
/**
65-
* Applies the CSS required to zoom in, prioritizes use of CSS3
70+
* Applies the CSS required to zoom in, prioritizes use of CSS3
6671
* transforms but falls back on zoom for IE.
67-
*
68-
* @param {Number} pageOffsetX
69-
* @param {Number} pageOffsetY
70-
* @param {Number} elementOffsetX
71-
* @param {Number} elementOffsetY
72-
* @param {Number} scale
72+
*
73+
* @param {Number} pageOffsetX
74+
* @param {Number} pageOffsetY
75+
* @param {Number} elementOffsetX
76+
* @param {Number} elementOffsetY
77+
* @param {Number} scale
7378
*/
7479
function magnify( pageOffsetX, pageOffsetY, elementOffsetX, elementOffsetY, scale ) {
7580

7681
if( supportsTransforms ) {
7782
var origin = pageOffsetX +'px '+ pageOffsetY +'px',
7883
transform = 'translate('+ -elementOffsetX +'px,'+ -elementOffsetY +'px) scale('+ scale +')';
79-
84+
8085
document.body.style.transformOrigin = origin;
8186
document.body.style.OTransformOrigin = origin;
8287
document.body.style.msTransformOrigin = origin;
@@ -121,15 +126,15 @@ var zoom = (function(){
121126
}
122127

123128
/**
124-
* Pan the document when the mosue cursor approaches the edges
129+
* Pan the document when the mosue cursor approaches the edges
125130
* of the window.
126131
*/
127132
function pan() {
128133
var range = 0.12,
129134
rangeX = window.innerWidth * range,
130135
rangeY = window.innerHeight * range,
131136
scrollOffset = getScrollOffset();
132-
137+
133138
// Up
134139
if( mouseY < rangeY ) {
135140
window.scroll( scrollOffset.x, scrollOffset.y - ( 1 - ( mouseY / rangeY ) ) * ( 14 / level ) );
@@ -159,7 +164,7 @@ var zoom = (function(){
159164
return {
160165
/**
161166
* Zooms in on either a rectangle or HTML element.
162-
*
167+
*
163168
* @param {Object} options
164169
* - element: HTML element to zoom in on
165170
* OR
@@ -232,7 +237,7 @@ var zoom = (function(){
232237
if( currentOptions && currentOptions.element ) {
233238
scrollOffset.x -= ( window.innerWidth - ( currentOptions.width * currentOptions.scale ) ) / 2;
234239
}
235-
240+
236241
magnify( scrollOffset.x, scrollOffset.y, 0, 0, 1 );
237242

238243
level = 1;
@@ -241,11 +246,11 @@ var zoom = (function(){
241246
// Alias
242247
magnify: function( options ) { this.to( options ) },
243248
reset: function() { this.out() },
244-
249+
245250
zoomLevel: function() {
246251
return level;
247252
}
248253
}
249-
254+
250255
})();
251256

0 commit comments

Comments
 (0)