From 0a76145a9367da6aef6efa71e4bb432f3e52a307 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 13 Oct 2015 14:35:22 +0200 Subject: [PATCH] Relay on the pointerType property in ol.events.condition.mouseOnly --- src/ol/events/condition.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ol/events/condition.js b/src/ol/events/condition.js index ad125b2dd4..e8bef80062 100644 --- a/src/ol/events/condition.js +++ b/src/ol/events/condition.js @@ -203,8 +203,6 @@ ol.events.condition.targetNotEditable = function(mapBrowserEvent) { ol.events.condition.mouseOnly = function(mapBrowserEvent) { goog.asserts.assertInstanceof(mapBrowserEvent, ol.MapBrowserPointerEvent, 'mapBrowserEvent should be an instance of ol.MapBrowserPointerEvent'); - /* pointerId must be 1 for mouse devices, - * see: http://www.w3.org/Submission/pointer-events/#pointerevent-interface - */ - return mapBrowserEvent.pointerEvent.pointerId == 1; + // see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType + return mapBrowserEvent.pointerEvent.pointerType == 'mouse'; };