diff --git a/src/mousetracker.js b/src/mousetracker.js index e56cb609..d64ef0b5 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -277,11 +277,6 @@ sentDragEvent: false }; - this.hasGestureHandlers = !!( this.pressHandler || this.nonPrimaryPressHandler || - this.releaseHandler || this.nonPrimaryReleaseHandler || - this.clickHandler || this.dblClickHandler || - this.dragHandler || this.dragEndHandler || - this.pinchHandler ); this.hasScrollHandler = !!this.scrollHandler; if ( $.MouseTracker.havePointerEvents ) { @@ -391,6 +386,23 @@ return count; }, + /** + * Do we currently have any assigned gesture handlers. + * @function + * @returns {Boolean} Do we currently have any assigned gesture handlers. + */ + hasGestureHandlers: function () { + return !!(this.pressHandler || + this.nonPrimaryPressHandler || + this.releaseHandler || + this.nonPrimaryReleaseHandler || + this.clickHandler || + this.dblClickHandler || + this.dragHandler || + this.dragEndHandler || + this.pinchHandler); + }, + /** * Implement or assign implementation to these handlers during or after * calling the constructor. @@ -2836,7 +2848,7 @@ eventInfo.isStoppable = true; eventInfo.isCancelable = true; eventInfo.preventDefault = false; - eventInfo.preventGesture = !tracker.hasGestureHandlers; + eventInfo.preventGesture = !tracker.hasGestureHandlers(); eventInfo.stopPropagation = false; break; case 'pointerover': @@ -2854,15 +2866,15 @@ case 'pointerdown': eventInfo.isStoppable = true; eventInfo.isCancelable = true; - eventInfo.preventDefault = false; // updatePointerDown() may set true (tracker.hasGestureHandlers) - eventInfo.preventGesture = !tracker.hasGestureHandlers; + eventInfo.preventDefault = false; // updatePointerDown() may set true (tracker.hasGestureHandlers()) + eventInfo.preventGesture = !tracker.hasGestureHandlers(); eventInfo.stopPropagation = false; break; case 'pointerup': eventInfo.isStoppable = true; eventInfo.isCancelable = true; eventInfo.preventDefault = false; - eventInfo.preventGesture = !tracker.hasGestureHandlers; + eventInfo.preventGesture = !tracker.hasGestureHandlers(); eventInfo.stopPropagation = false; break; case 'wheel':