From e47f629a9e0f3a329d7ff4ad26e878729565944d Mon Sep 17 00:00:00 2001 From: Mark Salsbery Date: Tue, 28 Jul 2020 20:20:09 -0700 Subject: [PATCH] Undo unnecessary event property changes from previous commit --- changelog.txt | 4 +--- src/button.js | 54 +++++++++------------------------------------------ src/viewer.js | 7 ------- 3 files changed, 10 insertions(+), 55 deletions(-) diff --git a/changelog.txt b/changelog.txt index dfe05953..19434936 100644 --- a/changelog.txt +++ b/changelog.txt @@ -9,18 +9,16 @@ OPENSEADRAGON CHANGELOG * Miscellaneous code cleanup (#1840 @msalsbery) * Improved browser sniffing - detect EDGE and CHROMEEDGE browsers * Improved DOM event model feature detection -* Added support for options parameter on addEvent()/removeEvent (to support passive option) +* Added support for options parameter on addEvent()/removeEvent (to support passive option) (#1669) * Added OpenSeadragon.eventIsCanceled() function for defaultPrevented detection on DOM events * MouseTracker: better PointerEvent model detection - removed use of deprecated window.navigator.pointerEnabled * MouseTracker: added overHandler/outHandler options for handling corresponding pointerover/pointerout events * MouseTracker: changed enterHandler/leaveHandler to use DOM pointerenter/pointerleave events instead of simulating using pointerover/pointerout * All internal uses of MouseTracker use pointerenter/pointerleave events instead of pointerover/pointerout events for more consistent pointer tracking * DEPRECATION: MouseTracker exitHandler deprecated for name change to leaveHandler for consistency with DOM event names -* Added missing Button event object properties (were listed in documentation but not implemented) * Fixed bug in Button class where two MouseTracker event handlers used an invalid "this" causing issues in some browsers * MouseTracker: IE 10 - MSPointerEnter/MSPointerLeave didn't exist then, simulated with MSPointerOver/MSPointerOut * MouseTracker: Simulate mouseover/mouseout on IE < 9 -* Pass missing eventSource property in Viewer canvas-enter, canvas-exit, container-enter, container-exit, canvas-drag, canvas-drag-end, canvas-pinch events * Added pointerType property to Viewer container-enter, container-exit, canvas-drag, canvas-drag-end, canvas-pinch events 2.4.2: diff --git a/src/button.js b/src/button.js index 9c3f2db0..e9663334 100644 --- a/src/button.js +++ b/src/button.js @@ -223,11 +223,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "enter", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "enter", { originalEvent: event.originalEvent } ); } else if ( !event.buttonDownAny ) { inTo( _this, $.ButtonState.HOVER ); } @@ -245,11 +241,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "focus", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "focus", { originalEvent: event.originalEvent } ); }, leaveHandler: function( event ) { @@ -265,11 +257,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "exit", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "exit", { originalEvent: event.originalEvent } ); } }, @@ -285,11 +273,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "blur", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "blur", { originalEvent: event.originalEvent } ); }, pressHandler: function ( event ) { @@ -304,11 +288,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "press", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "press", { originalEvent: event.originalEvent } ); }, releaseHandler: function( event ) { @@ -324,11 +304,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "release", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "release", { originalEvent: event.originalEvent } ); } else if ( event.insideElementPressed ) { outTo( _this, $.ButtonState.GROUP ); } else { @@ -348,11 +324,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent("click", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - }); + _this.raiseEvent("click", { originalEvent: event.originalEvent }); } }, @@ -369,11 +341,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "click", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "click", { originalEvent: event.originalEvent } ); /*** * Raised when the mouse button is released or touch ends in the Button element. * @@ -384,11 +352,7 @@ $.Button = function( options ) { * @property {Object} originalEvent - The original DOM event. * @property {?Object} userData - Arbitrary subscriber-defined object. */ - _this.raiseEvent( "release", { - eventSource: _this, - originalEvent: event.originalEvent, - userData: _this.userData - } ); + _this.raiseEvent( "release", { originalEvent: event.originalEvent } ); return false; } return true; diff --git a/src/viewer.js b/src/viewer.js index 45943ba8..6b58bfa5 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -2783,7 +2783,6 @@ function onCanvasDrag( event ) { var gestureSettings; var canvasDragEventArgs = { - eventSource: this, tracker: event.eventSource, pointerType: event.pointerType, position: event.position, @@ -2892,7 +2891,6 @@ function onCanvasDragEnd( event ) { * @property {?Object} userData - Arbitrary subscriber-defined object. */ this.raiseEvent('canvas-drag-end', { - eventSource: this, tracker: event.eventSource, pointerType: event.pointerType, position: event.position, @@ -2922,7 +2920,6 @@ function onCanvasEnter( event ) { * @property {?Object} userData - Arbitrary subscriber-defined object. */ this.raiseEvent( 'canvas-enter', { - eventSource: this, tracker: event.eventSource, pointerType: event.pointerType, position: event.position, @@ -2958,7 +2955,6 @@ function onCanvasLeave( event ) { * @property {?Object} userData - Arbitrary subscriber-defined object. */ this.raiseEvent( 'canvas-exit', { - eventSource: this, tracker: event.eventSource, pointerType: event.pointerType, position: event.position, @@ -3130,7 +3126,6 @@ function onCanvasPinch( event ) { * @property {?Object} userData - Arbitrary subscriber-defined object. */ this.raiseEvent('canvas-pinch', { - eventSource: this, tracker: event.eventSource, pointerType: event.pointerType, gesturePoints: event.gesturePoints, @@ -3231,7 +3226,6 @@ function onContainerEnter( event ) { * @property {?Object} userData - Arbitrary subscriber-defined object. */ this.raiseEvent( 'container-enter', { - eventSource: this, tracker: event.eventSource, pointerType: event.pointerType, position: event.position, @@ -3268,7 +3262,6 @@ function onContainerLeave( event ) { * @property {?Object} userData - Arbitrary subscriber-defined object. */ this.raiseEvent( 'container-exit', { - eventSource: this, tracker: event.eventSource, pointerType: event.pointerType, position: event.position,