From 3b01014ac8893d3726acb75fd79c70225e5d4690 Mon Sep 17 00:00:00 2001 From: Mark Salsbery Date: Tue, 20 Jan 2015 10:26:14 -0800 Subject: [PATCH] Fixed pointer event model detection for IE 10 (#571) --- changelog.txt | 1 + src/mousetracker.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index e3bd3156..4d0ebbae 100644 --- a/changelog.txt +++ b/changelog.txt @@ -20,6 +20,7 @@ OPENSEADRAGON CHANGELOG * Requesting keyboard focus when viewer is clicked (#537) * Arrow key navigation fixed across platforms (#565) * Removed textarea element from viewer DOM. Viewer.canvas now handles keyboard navigation (#569) +* Fixed pointer event model detection for IE 10 (#571) 1.2.0: diff --git a/src/mousetracker.js b/src/mousetracker.js index 9e8f25ef..8693067e 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -988,7 +988,7 @@ $.MouseTracker.maxTouchPoints = 0; } $.MouseTracker.haveMouseEnter = false; - } else if ( window.MSPointerEvent ) { + } else if ( window.MSPointerEvent && window.navigator.msPointerEnabled ) { // IE10 $.MouseTracker.havePointerEvents = true; $.MouseTracker.subscribeEvents.push( "MSPointerOver", "MSPointerOut", "MSPointerDown", "MSPointerUp", "MSPointerMove", "MSPointerCancel" );