ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5616 from ahocevar/fix-mouseonly-type

Browse Source 
Fix event type and documentation of ol.events.condition.mouseOnly
This commit is contained in:
Andreas Hocevar
2016-08-23 09:46:16 +02:00
committed by GitHub
parent 0f9a1830b8 4b68df73a8
commit c81709bed3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/errors/index.md
View File

@@ -220,3 +220,7 @@ Hex color should have 3 or 6 digits.
### 55 ### 55
The `{-y}` placeholder requires a tile grid with extent. The `{-y}` placeholder requires a tile grid with extent.
### 56
`mapBrowserEvent` must originate from a pointer event.

6
src/ol/events/condition.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol.events.condition');
goog.require('ol.functions'); goog.require('ol.functions');
goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserEvent.EventType');
goog.require('ol.MapBrowserPointerEvent');
/** /**
@@ -204,10 +203,9 @@ ol.events.condition.targetNotEditable = function(mapBrowserEvent) {
* @api stable * @api stable
*/ */
ol.events.condition.mouseOnly = function(mapBrowserEvent) { ol.events.condition.mouseOnly = function(mapBrowserEvent) {
ol.assert(mapBrowserEvent.pointerEvent, 56); // mapBrowserEvent must originate from a pointer event
// see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType // see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType
goog.asserts.assertInstanceof(mapBrowserEvent, ol.MapBrowserPointerEvent, return /** @type {ol.MapBrowserEvent} */ (mapBrowserEvent).pointerEvent.pointerType == 'mouse';
'Requires an ol.MapBrowserPointerEvent to work.');
return mapBrowserEvent.pointerEvent.pointerType == 'mouse';
}; };