diff --git a/examples/getfeatureinfo.js b/examples/getfeatureinfo.js index fcf32db161..ae7258d6cb 100644 --- a/examples/getfeatureinfo.js +++ b/examples/getfeatureinfo.js @@ -46,7 +46,7 @@ var map = new ol.Map({ }) }); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { map.getFeatureInfo({ pixel: evt.getPixel(), success: function(featureInfoByLayer) { diff --git a/examples/gpx.js b/examples/gpx.js index 899b9cdb31..df2452b176 100644 --- a/examples/gpx.js +++ b/examples/gpx.js @@ -48,7 +48,7 @@ $(map.getViewport()).on('mousemove', function(evt) { displayFeatureInfo(pixel); }); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { var pixel = evt.getPixel(); displayFeatureInfo(pixel); }); diff --git a/examples/icon.js b/examples/icon.js index af0e158b30..07ef45ce88 100644 --- a/examples/icon.js +++ b/examples/icon.js @@ -71,7 +71,7 @@ var popup = new ol.Overlay({ map.addOverlay(popup); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { map.getFeatures({ pixel: evt.getPixel(), layers: [vector], diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js index fd2405cea9..8ff5de66d1 100644 --- a/examples/kml-earthquakes.js +++ b/examples/kml-earthquakes.js @@ -87,7 +87,7 @@ $(map.getViewport()).on('mousemove', function(evt) { displayFeatureInfo(pixel); }); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { var pixel = evt.getPixel(); displayFeatureInfo(pixel); }); diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 6657961593..8b88d27d93 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -109,7 +109,7 @@ $(map.getViewport()).on('mousemove', function(evt) { displayFeatureInfo(pixel); }); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { var pixel = evt.getPixel(); displayFeatureInfo(pixel); }); diff --git a/examples/kml.js b/examples/kml.js index bce5752903..c356c761d8 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -59,7 +59,7 @@ $(map.getViewport()).on('mousemove', function(evt) { displayFeatureInfo(pixel); }); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { var pixel = evt.getPixel(); displayFeatureInfo(pixel); }); diff --git a/examples/overlay.js b/examples/overlay.js index bc5d12915c..e4e036c099 100644 --- a/examples/overlay.js +++ b/examples/overlay.js @@ -47,7 +47,7 @@ var popup = new ol.Overlay({ }); map.addOverlay(popup); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { var element = popup.getElement(); var coordinate = evt.getCoordinate(); var hdms = ol.coordinate.toStringHDMS(ol.proj.transform( diff --git a/examples/popup.js b/examples/popup.js index 944b5b8b8b..0c6a362153 100644 --- a/examples/popup.js +++ b/examples/popup.js @@ -61,7 +61,7 @@ var map = new ol.Map({ /** * Add a click handler to the map to render the popup. */ -map.on('click', function(evt) { +map.on('singleclick', function(evt) { var coordinate = evt.getCoordinate(); var hdms = ol.coordinate.toStringHDMS(ol.proj.transform( coordinate, 'EPSG:3857', 'EPSG:4326')); diff --git a/examples/vector-layer.js b/examples/vector-layer.js index f1c2df3d7a..2f4214ced2 100644 --- a/examples/vector-layer.js +++ b/examples/vector-layer.js @@ -82,7 +82,7 @@ $(map.getViewport()).on('mousemove', function(evt) { displayFeatureInfo(pixel); }); -map.on('click', function(evt) { +map.on('singleclick', function(evt) { var pixel = evt.getPixel(); displayFeatureInfo(pixel); }); diff --git a/src/ol/events/condition.js b/src/ol/events/condition.js index 02be818677..7171cbde36 100644 --- a/src/ol/events/condition.js +++ b/src/ol/events/condition.js @@ -54,8 +54,8 @@ ol.events.condition.always = goog.functions.TRUE; * @return {boolean} True if the event is a click event. * @todo stability experimental */ -ol.events.condition.clickOnly = function(mapBrowserEvent) { - return mapBrowserEvent.type == ol.MapBrowserEvent.EventType.CLICK; +ol.events.condition.singleClick = function(mapBrowserEvent) { + return mapBrowserEvent.type == ol.MapBrowserEvent.EventType.SINGLECLICK; }; diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index 553254421e..705e872671 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -27,7 +27,7 @@ ol.interaction.Select = function(opt_options) { * @type {ol.events.ConditionType} */ this.condition_ = goog.isDef(options.condition) ? - options.condition : ol.events.condition.clickOnly; + options.condition : ol.events.condition.singleClick; /** * @private diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index b5c19b4d17..237ac700c9 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -195,7 +195,7 @@ ol.MapBrowserEventHandler.prototype.emulateClick_ = function(browserEvent) { this.clickTimeoutId_ = goog.global.setTimeout(goog.bind(function() { this.clickTimeoutId_ = 0; var newEvent = new ol.MapBrowserEvent( - ol.MapBrowserEvent.EventType.CLICK, this.map_, browserEvent); + ol.MapBrowserEvent.EventType.SINGLECLICK, this.map_, browserEvent); this.dispatchEvent(newEvent); }, this), 250); } @@ -341,12 +341,12 @@ ol.MapBrowserEventHandler.prototype.disposeInternal = function() { * @enum {string} */ ol.MapBrowserEvent.EventType = { - CLICK: goog.events.EventType.CLICK, DBLCLICK: goog.events.EventType.DBLCLICK, DOWN: 'down', DRAGSTART: 'dragstart', DRAG: 'drag', DRAGEND: 'dragend', + SINGLECLICK: 'singleclick', TOUCHSTART: goog.events.EventType.TOUCHSTART, TOUCHMOVE: goog.events.EventType.TOUCHMOVE, TOUCHEND: goog.events.EventType.TOUCHEND diff --git a/test/spec/ol/mapbrowserevent.test.js b/test/spec/ol/mapbrowserevent.test.js index 42ae60fe78..cf2b385fc7 100644 --- a/test/spec/ol/mapbrowserevent.test.js +++ b/test/spec/ol/mapbrowserevent.test.js @@ -4,15 +4,15 @@ describe('ol.MapBrowserEventHandler', function() { describe('#emulateClick_', function() { var clock; var handler; - var clickSpy; + var singleclickSpy; var dblclickSpy; beforeEach(function() { clock = sinon.useFakeTimers(); handler = new ol.MapBrowserEventHandler(new ol.Map({})); - clickSpy = sinon.spy(); - goog.events.listen(handler, 'click', clickSpy); + singleclickSpy = sinon.spy(); + goog.events.listen(handler, 'singleclick', singleclickSpy); dblclickSpy = sinon.spy(); goog.events.listen(handler, 'dblclick', dblclickSpy); @@ -24,29 +24,29 @@ describe('ol.MapBrowserEventHandler', function() { it('emulates click', function() { handler.emulateClick_(); - expect(clickSpy.called).to.not.be.ok(); + expect(singleclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); clock.tick(250); - expect(clickSpy.calledOnce).to.be.ok(); + expect(singleclickSpy.calledOnce).to.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); handler.emulateClick_(); - expect(clickSpy.calledOnce).to.be.ok(); + expect(singleclickSpy.calledOnce).to.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); }); it('emulates dblclick', function() { handler.emulateClick_(); - expect(clickSpy.called).to.not.be.ok(); + expect(singleclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); handler.emulateClick_(); - expect(clickSpy.called).to.not.be.ok(); + expect(singleclickSpy.called).to.not.be.ok(); expect(dblclickSpy.calledOnce).to.be.ok(); clock.tick(250); - expect(clickSpy.called).to.not.be.ok(); + expect(singleclickSpy.called).to.not.be.ok(); expect(dblclickSpy.calledOnce).to.be.ok(); });