From 1c465ec59c13920c56c3a4655dc75af619174989 Mon Sep 17 00:00:00 2001
From: Mark Salsbery <msalsbery@hotmail.com>
Date: Mon, 12 Jan 2015 15:33:18 -0800
Subject: [PATCH] Revert "Second attempt: capturePointer()/releasePointer()
call fix for pointer event model"
This reverts commit 1bdb83dc583889582c23d7276659143bdaf41fee.
---
src/mousetracker.js | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/mousetracker.js b/src/mousetracker.js
index d566f54a..d1722b16 100644
--- a/src/mousetracker.js
+++ b/src/mousetracker.js
@@ -1250,17 +1250,17 @@
* @private
* @inner
*/
- function capturePointer( tracker, pointerType, isPointerEventModel ) {
+ function capturePointer( tracker, pointerType ) {
var pointsList = tracker.getActivePointersListByType( pointerType ),
eventParams;
pointsList.captureCount++;
if ( pointsList.captureCount === 1 ) {
- if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 10 ) {
+ if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 9 ) {
tracker.element.setCapture( true );
} else {
- eventParams = getCaptureEventParams( tracker, tracker, isPointerEventModel ? 'pointerevent' : pointerType );
+ eventParams = getCaptureEventParams( tracker, pointerType );
// 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)
$.addEvent(
@@ -1285,17 +1285,17 @@
* @private
* @inner
*/
- function releasePointer( tracker, pointerType, isPointerEventModel ) {
+ function releasePointer( tracker, pointerType ) {
var pointsList = tracker.getActivePointersListByType( pointerType ),
eventParams;
pointsList.captureCount--;
if ( pointsList.captureCount === 0 ) {
- if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 10 ) {
+ if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 9 ) {
tracker.element.releaseCapture();
} else {
- eventParams = getCaptureEventParams( tracker, isPointerEventModel ? 'pointerevent' : pointerType );
+ eventParams = getCaptureEventParams( tracker, pointerType );
// 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)
$.removeEvent(
@@ -1718,7 +1718,7 @@
if ( updatePointersDown( tracker, event, [ gPoint ], getStandardizedButton( event.button ) ) ) {
$.stopEvent( event );
- capturePointer( tracker, 'mouse', false );
+ capturePointer( tracker, 'mouse' );
}
if ( tracker.clickHandler || tracker.dblClickHandler || tracker.pressHandler || tracker.dragHandler || tracker.dragEndHandler ) {
@@ -1766,7 +1766,7 @@
};
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
$.stopEvent( event );
- capturePointer( tracker, 'touch', false );
+ capturePointer( tracker, 'touch' );
}
$.cancelEvent( event );
@@ -1941,7 +1941,7 @@
}
if ( updatePointersUp( tracker, event, gPoints, 0 ) ) {
- releasePointer( tracker, 'touch', false );
+ releasePointer( tracker, 'touch' );
}
// simulate touchleave if not natively available
@@ -2104,7 +2104,7 @@
if ( updatePointersDown( tracker, event, [ gPoint ], event.button ) ) {
$.stopEvent( event );
- capturePointer( tracker, gPoint.type, true );
+ capturePointer( tracker, gPoint.type );
}
if ( tracker.clickHandler || tracker.dblClickHandler || tracker.pressHandler || tracker.dragHandler || tracker.dragEndHandler || tracker.pinchHandler ) {
@@ -2154,7 +2154,7 @@
};
if ( updatePointersUp( tracker, event, [ gPoint ], event.button ) ) {
- releasePointer( tracker, gPoint.type, true );
+ releasePointer( tracker, gPoint.type );
}
}