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

Merge pull request #3391 from fredj/cleanup

Browse Source 
Minor code cleanup
This commit is contained in:
Frédéric Junod
2015-03-24 14:57:51 +01:00
parent 5c6c45fc92 b7c4e4f297
commit 1d04eabeda
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ol/interaction/pointerinteraction.js
View File

@@ -184,13 +184,10 @@ ol.interaction.Pointer.handleEvent = function(mapBrowserEvent) {
var stopEvent = false; var stopEvent = false;
this.updateTrackedPointers_(mapBrowserEvent); this.updateTrackedPointers_(mapBrowserEvent);
if (this.handlingDownUpSequence) { if (this.handlingDownUpSequence) {
if (mapBrowserEvent.type == if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.POINTERDRAG) {
ol.MapBrowserEvent.EventType.POINTERDRAG) {
this.handleDragEvent_(mapBrowserEvent); this.handleDragEvent_(mapBrowserEvent);
} else if (mapBrowserEvent.type == } else if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.POINTERUP) {
ol.MapBrowserEvent.EventType.POINTERUP) { this.handlingDownUpSequence = this.handleUpEvent_(mapBrowserEvent);
this.handlingDownUpSequence =
this.handleUpEvent_(mapBrowserEvent);
} }
} }
if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.POINTERDOWN) { if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.POINTERDOWN) {

1
test/spec/ol/interaction/selectinteraction.test.js
View File

@@ -66,7 +66,6 @@ describe('ol.interaction.Select', function() {
clientY: position.y + y + height / 2, clientY: position.y + y + height / 2,
shiftKey: shiftKey shiftKey: shiftKey
}))); })));
console.debug(event);
map.handleMapBrowserEvent(event); map.handleMapBrowserEvent(event);
} }