aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2014-03-12 08:52:12 +0100
committerHakim El Hattab <hakim.elhattab@gmail.com>2014-03-12 08:52:12 +0100
commit8c32e2e967a7c7b7d41f7f7a2349eceb54736f93 (patch)
tree9e367f3264c50e3d26aac45c024a1eb792645e97
parent1c2f4a2e9243d43abf1f6606cfba079daa7d72f7 (diff)
parent397603073385d108998a08b311fb0a7927db3d8c (diff)
downloadfosdem-2018-presentation-8c32e2e967a7c7b7d41f7f7a2349eceb54736f93.tar
fosdem-2018-presentation-8c32e2e967a7c7b7d41f7f7a2349eceb54736f93.tar.gz
Merge branch 'dev' of github.com:hakimel/reveal.js into dev
-rw-r--r--plugin/leap/leap.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugin/leap/leap.js b/plugin/leap/leap.js
index 9d5271a..48084ff 100644
--- a/plugin/leap/leap.js
+++ b/plugin/leap/leap.js
@@ -76,8 +76,10 @@ var b=right.criteria;if(a!==b){if(a>b||a===void 0)return 1;if(a<b||b===void 0)re
pointer.style.borderRadius = size - 5 + 'px';
pointer.style.visibility = 'visible';
+ tipPosition = frame.fingers[0].tipPosition;
+
if( config.autoCenter ) {
- tipPosition = frame.fingers[0].tipPosition;
+
// Check whether the finger has entered the z range of the Leap Motion. Used for the autoCenter option.
if( !entered ) {
@@ -144,7 +146,7 @@ var b=right.criteria;if(a!==b){if(a>b||a===void 0)return 1;if(a<b||b===void 0)re
// Two hand gestures
else if( frame.hands.length === 2 ) {
// Upward two hand swipe gesture
- if( gesture.direction[1] > 0 && gesture.type === 'swipe' ) {
+ if( gesture.type === 'swipe' && gesture.direction[1] > 0 ) {
Reveal.toggleOverview();
}