mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-25 22:56:11 +03:00
MouseTracker Original Events in Handlers
Renamed insideElementRelease to insideElementReleased.
This commit is contained in:
parent
1dc2d7e011
commit
af078f8f19
@ -207,7 +207,7 @@ $.Button = function( options ) {
|
||||
},
|
||||
|
||||
releaseHandler: function( tracker, eventData ) {
|
||||
if ( eventData.insideElementPressed && eventData.insideElementRelease ) {
|
||||
if ( eventData.insideElementPressed && eventData.insideElementReleased ) {
|
||||
outTo( _this, $.ButtonState.HOVER );
|
||||
_this.raiseEvent( "onRelease", _this );
|
||||
} else if ( eventData.insideElementPressed ) {
|
||||
|
@ -101,7 +101,7 @@ $.ButtonGroup = function( options ) {
|
||||
},
|
||||
releaseHandler: function ( tracker, eventData ) {
|
||||
var i;
|
||||
if ( !eventData.insideElementRelease ) {
|
||||
if ( !eventData.insideElementReleased ) {
|
||||
for ( i = 0; i < _this.buttons.length; i++ ) {
|
||||
_this.buttons[ i ].notifyGroupExit();
|
||||
}
|
||||
|
@ -280,7 +280,7 @@
|
||||
* {
|
||||
* position: The position of the event relative to the tracked element.
|
||||
* insideElementPressed: True if the left mouse button is currently being pressed and was initiated inside the tracked element, otherwise false.
|
||||
* insideElementRelease: Was the mouse still inside the tracked element when the button was released.
|
||||
* insideElementReleased: Was the mouse still inside the tracked element when the button was released.
|
||||
* isTouchEvent: True if the original event is a touch event, otherwise false.
|
||||
* originalEvent: The original event object.
|
||||
* userData: Arbitrary user-defined object.
|
||||
@ -881,7 +881,7 @@
|
||||
//were we inside the tracked element when we were pressed
|
||||
insideElementPressed = delegate.insideElementPressed,
|
||||
//are we still inside the tracked element when we released
|
||||
insideElementRelease = delegate.insideElement,
|
||||
insideElementReleased = delegate.insideElement,
|
||||
propagate;
|
||||
|
||||
isTouch = isTouch || false;
|
||||
@ -902,7 +902,7 @@
|
||||
{
|
||||
position: getMouseRelative( event, tracker.element ),
|
||||
insideElementPressed: insideElementPressed,
|
||||
insideElementRelease: insideElementRelease,
|
||||
insideElementReleased: insideElementReleased,
|
||||
isTouchEvent: isTouch,
|
||||
originalEvent: originalEvent,
|
||||
userData: tracker.userData
|
||||
@ -913,7 +913,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
if ( insideElementPressed && insideElementRelease ) {
|
||||
if ( insideElementPressed && insideElementReleased ) {
|
||||
handleMouseClick( tracker, originalEvent, isTouch );
|
||||
}
|
||||
}
|
||||
|
@ -198,7 +198,7 @@ $.ReferenceStrip = function ( options ) {
|
||||
now = $.now();
|
||||
|
||||
if ( eventData.insideElementPressed &&
|
||||
eventData.insideElementRelease &&
|
||||
eventData.insideElementReleased &&
|
||||
tracker.dragging &&
|
||||
( now - tracker.dragging ) < tracker.clickTimeThreshold ) {
|
||||
tracker.dragging = null;
|
||||
|
@ -1479,7 +1479,7 @@ function onCanvasRelease( tracker, eventData ) {
|
||||
tracker: tracker,
|
||||
position: eventData.position,
|
||||
insideElementPressed: eventData.insideElementPressed,
|
||||
insideElementRelease: eventData.insideElementRelease
|
||||
insideElementReleased: eventData.insideElementReleased
|
||||
});
|
||||
}
|
||||
|
||||
@ -1519,7 +1519,7 @@ function onContainerExit( tracker, eventData ) {
|
||||
}
|
||||
|
||||
function onContainerRelease( tracker, eventData ) {
|
||||
if ( !eventData.insideElementRelease ) {
|
||||
if ( !eventData.insideElementReleased ) {
|
||||
THIS[ this.hash ].mouseInside = false;
|
||||
if ( !THIS[ this.hash ].animating ) {
|
||||
beginControlsAutoHide( this );
|
||||
@ -1529,7 +1529,7 @@ function onContainerRelease( tracker, eventData ) {
|
||||
tracker: tracker,
|
||||
position: eventData.position,
|
||||
insideElementPressed: eventData.insideElementPressed,
|
||||
insideElementRelease: eventData.insideElementRelease
|
||||
insideElementReleased: eventData.insideElementReleased
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user