mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-18 07:43:13 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Second attempt: capturePointer()/releasePointer() call fix for pointer event model"

Browse Source 
This reverts commit 1bdb83dc583889582c23d7276659143bdaf41fee.
This commit is contained in:
Mark Salsbery 2015-01-12 15:33:18 -08:00
parent 1bdb83dc58
commit 1c465ec59c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mousetracker.js
View File

@ -1250,17 +1250,17 @@
* @private * @private
* @inner * @inner
*/ */
function capturePointer( tracker, pointerType, isPointerEventModel ) { function capturePointer( tracker, pointerType ) {
var pointsList = tracker.getActivePointersListByType( pointerType ), var pointsList = tracker.getActivePointersListByType( pointerType ),
eventParams; eventParams;
pointsList.captureCount++; pointsList.captureCount++;
if ( pointsList.captureCount === 1 ) { if ( pointsList.captureCount === 1 ) {
if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 10 ) { if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 9 ) {
tracker.element.setCapture( true ); tracker.element.setCapture( true );
} else { } else {
eventParams = getCaptureEventParams( tracker, tracker, isPointerEventModel ? 'pointerevent' : pointerType ); eventParams = getCaptureEventParams( tracker, pointerType );
// We emulate mouse capture by hanging listeners on the document object. // We emulate mouse capture by hanging listeners on the document object.
// (Note we listen on the capture phase so the captured handlers will get called first) // (Note we listen on the capture phase so the captured handlers will get called first)
$.addEvent( $.addEvent(
@ -1285,17 +1285,17 @@
* @private * @private
* @inner * @inner
*/ */
function releasePointer( tracker, pointerType, isPointerEventModel ) { function releasePointer( tracker, pointerType ) {
var pointsList = tracker.getActivePointersListByType( pointerType ), var pointsList = tracker.getActivePointersListByType( pointerType ),
eventParams; eventParams;
pointsList.captureCount--; pointsList.captureCount--;
if ( pointsList.captureCount === 0 ) { if ( pointsList.captureCount === 0 ) {
if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 10 ) { if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 9 ) {
tracker.element.releaseCapture(); tracker.element.releaseCapture();
} else { } else {
eventParams = getCaptureEventParams( tracker, isPointerEventModel ? 'pointerevent' : pointerType ); eventParams = getCaptureEventParams( tracker, pointerType );
// We emulate mouse capture by hanging listeners on the document object. // We emulate mouse capture by hanging listeners on the document object.
// (Note we listen on the capture phase so the captured handlers will get called first) // (Note we listen on the capture phase so the captured handlers will get called first)
$.removeEvent( $.removeEvent(
@ -1718,7 +1718,7 @@
if ( updatePointersDown( tracker, event, [ gPoint ], getStandardizedButton( event.button ) ) ) { if ( updatePointersDown( tracker, event, [ gPoint ], getStandardizedButton( event.button ) ) ) {
$.stopEvent( event ); $.stopEvent( event );
capturePointer( tracker, 'mouse', false ); capturePointer( tracker, 'mouse' );
} }
if ( tracker.clickHandler || tracker.dblClickHandler || tracker.pressHandler || tracker.dragHandler || tracker.dragEndHandler ) { if ( tracker.clickHandler || tracker.dblClickHandler || tracker.pressHandler || tracker.dragHandler || tracker.dragEndHandler ) {
@ -1766,7 +1766,7 @@
}; };
if ( updatePointersUp( tracker, event, [ gPoint ], getStandardizedButton( event.button ) ) ) { if ( updatePointersUp( tracker, event, [ gPoint ], getStandardizedButton( event.button ) ) ) {
releasePointer( tracker, 'mouse', false ); releasePointer( tracker, 'mouse' );
} }
} }
@ -1889,7 +1889,7 @@
if ( updatePointersDown( tracker, event, gPoints, 0 ) ) { // 0 means primary button press/release or touch contact if ( updatePointersDown( tracker, event, gPoints, 0 ) ) { // 0 means primary button press/release or touch contact
$.stopEvent( event ); $.stopEvent( event );
capturePointer( tracker, 'touch', false ); capturePointer( tracker, 'touch' );
} }
$.cancelEvent( event ); $.cancelEvent( event );
@ -1941,7 +1941,7 @@
} }
if ( updatePointersUp( tracker, event, gPoints, 0 ) ) { if ( updatePointersUp( tracker, event, gPoints, 0 ) ) {
releasePointer( tracker, 'touch', false ); releasePointer( tracker, 'touch' );
} }
// simulate touchleave if not natively available // simulate touchleave if not natively available
@ -2104,7 +2104,7 @@
if ( updatePointersDown( tracker, event, [ gPoint ], event.button ) ) { if ( updatePointersDown( tracker, event, [ gPoint ], event.button ) ) {
$.stopEvent( event ); $.stopEvent( event );
capturePointer( tracker, gPoint.type, true ); capturePointer( tracker, gPoint.type );
} }
if ( tracker.clickHandler || tracker.dblClickHandler || tracker.pressHandler || tracker.dragHandler || tracker.dragEndHandler || tracker.pinchHandler ) { if ( tracker.clickHandler || tracker.dblClickHandler || tracker.pressHandler || tracker.dragHandler || tracker.dragEndHandler || tracker.pinchHandler ) {
@ -2154,7 +2154,7 @@
}; };
if ( updatePointersUp( tracker, event, [ gPoint ], event.button ) ) { if ( updatePointersUp( tracker, event, [ gPoint ], event.button ) ) {
releasePointer( tracker, gPoint.type, true ); releasePointer( tracker, gPoint.type );
} }
} }