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

Map "click" event renamed to "singleclick"

Browse Source 
As discussed with @tschaub in #1195.
This commit is contained in:
Éric Lemoine
2013-10-31 09:17:24 +01:00
parent 2c930d74b5
commit 8402eee0c3
13 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/getfeatureinfo.js
View File

@@ -46,7 +46,7 @@ var map = new ol.Map({
}) })
}); });
map.on('click', function(evt) { map.on('singleclick', function(evt) {
map.getFeatureInfo({ map.getFeatureInfo({
pixel: evt.getPixel(), pixel: evt.getPixel(),
success: function(featureInfoByLayer) { success: function(featureInfoByLayer) {

2
examples/gpx.js
View File

@@ -48,7 +48,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });
map.on('click', function(evt) { map.on('singleclick', function(evt) {
var pixel = evt.getPixel(); var pixel = evt.getPixel();
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

2
examples/icon.js
View File

@@ -71,7 +71,7 @@ var popup = new ol.Overlay({
map.addOverlay(popup); map.addOverlay(popup);
map.on('click', function(evt) { map.on('singleclick', function(evt) {
map.getFeatures({ map.getFeatures({
pixel: evt.getPixel(), pixel: evt.getPixel(),
layers: [vector], layers: [vector],

2
examples/kml-earthquakes.js
View File

@@ -87,7 +87,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });
map.on('click', function(evt) { map.on('singleclick', function(evt) {
var pixel = evt.getPixel(); var pixel = evt.getPixel();
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

2
examples/kml-timezones.js
View File

@@ -109,7 +109,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });
map.on('click', function(evt) { map.on('singleclick', function(evt) {
var pixel = evt.getPixel(); var pixel = evt.getPixel();
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

2
examples/kml.js
View File

@@ -59,7 +59,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });
map.on('click', function(evt) { map.on('singleclick', function(evt) {
var pixel = evt.getPixel(); var pixel = evt.getPixel();
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

2
examples/overlay.js
View File

@@ -47,7 +47,7 @@ var popup = new ol.Overlay({
}); });
map.addOverlay(popup); map.addOverlay(popup);
map.on('click', function(evt) { map.on('singleclick', function(evt) {
var element = popup.getElement(); var element = popup.getElement();
var coordinate = evt.getCoordinate(); var coordinate = evt.getCoordinate();
var hdms = ol.coordinate.toStringHDMS(ol.proj.transform( var hdms = ol.coordinate.toStringHDMS(ol.proj.transform(

2
examples/popup.js
View File

@@ -61,7 +61,7 @@ var map = new ol.Map({
/** /**
* Add a click handler to the map to render the popup. * 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 coordinate = evt.getCoordinate();
var hdms = ol.coordinate.toStringHDMS(ol.proj.transform( var hdms = ol.coordinate.toStringHDMS(ol.proj.transform(
coordinate, 'EPSG:3857', 'EPSG:4326')); coordinate, 'EPSG:3857', 'EPSG:4326'));

2
examples/vector-layer.js
View File

@@ -82,7 +82,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });
map.on('click', function(evt) { map.on('singleclick', function(evt) {
var pixel = evt.getPixel(); var pixel = evt.getPixel();
displayFeatureInfo(pixel); displayFeatureInfo(pixel);
}); });

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

@@ -54,8 +54,8 @@ ol.events.condition.always = goog.functions.TRUE;
* @return {boolean} True if the event is a click event. * @return {boolean} True if the event is a click event.
* @todo stability experimental * @todo stability experimental
*/ */
ol.events.condition.clickOnly = function(mapBrowserEvent) { ol.events.condition.singleClick = function(mapBrowserEvent) {
return mapBrowserEvent.type == ol.MapBrowserEvent.EventType.CLICK; return mapBrowserEvent.type == ol.MapBrowserEvent.EventType.SINGLECLICK;
}; };

2
src/ol/interaction/selectinteraction.js
View File

@@ -27,7 +27,7 @@ ol.interaction.Select = function(opt_options) {
* @type {ol.events.ConditionType} * @type {ol.events.ConditionType}
*/ */
this.condition_ = goog.isDef(options.condition) ? this.condition_ = goog.isDef(options.condition) ?
options.condition : ol.events.condition.clickOnly; options.condition : ol.events.condition.singleClick;
/** /**
* @private * @private

4
src/ol/mapbrowserevent.js
View File

@@ -195,7 +195,7 @@ ol.MapBrowserEventHandler.prototype.emulateClick_ = function(browserEvent) {
this.clickTimeoutId_ = goog.global.setTimeout(goog.bind(function() { this.clickTimeoutId_ = goog.global.setTimeout(goog.bind(function() {
this.clickTimeoutId_ = 0; this.clickTimeoutId_ = 0;
var newEvent = new ol.MapBrowserEvent( var newEvent = new ol.MapBrowserEvent(
ol.MapBrowserEvent.EventType.CLICK, this.map_, browserEvent); ol.MapBrowserEvent.EventType.SINGLECLICK, this.map_, browserEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
}, this), 250); }, this), 250);
} }
@@ -341,12 +341,12 @@ ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
* @enum {string} * @enum {string}
*/ */
ol.MapBrowserEvent.EventType = { ol.MapBrowserEvent.EventType = {
CLICK: goog.events.EventType.CLICK,
DBLCLICK: goog.events.EventType.DBLCLICK, DBLCLICK: goog.events.EventType.DBLCLICK,
DOWN: 'down', DOWN: 'down',
DRAGSTART: 'dragstart', DRAGSTART: 'dragstart',
DRAG: 'drag', DRAG: 'drag',
DRAGEND: 'dragend', DRAGEND: 'dragend',
SINGLECLICK: 'singleclick',
TOUCHSTART: goog.events.EventType.TOUCHSTART, TOUCHSTART: goog.events.EventType.TOUCHSTART,
TOUCHMOVE: goog.events.EventType.TOUCHMOVE, TOUCHMOVE: goog.events.EventType.TOUCHMOVE,
TOUCHEND: goog.events.EventType.TOUCHEND TOUCHEND: goog.events.EventType.TOUCHEND

18
test/spec/ol/mapbrowserevent.test.js
View File

@@ -4,15 +4,15 @@ describe('ol.MapBrowserEventHandler', function() {
describe('#emulateClick_', function() { describe('#emulateClick_', function() {
var clock; var clock;
var handler; var handler;
var clickSpy; var singleclickSpy;
var dblclickSpy; var dblclickSpy;
beforeEach(function() { beforeEach(function() {
clock = sinon.useFakeTimers(); clock = sinon.useFakeTimers();
handler = new ol.MapBrowserEventHandler(new ol.Map({})); handler = new ol.MapBrowserEventHandler(new ol.Map({}));
clickSpy = sinon.spy(); singleclickSpy = sinon.spy();
goog.events.listen(handler, 'click', clickSpy); goog.events.listen(handler, 'singleclick', singleclickSpy);
dblclickSpy = sinon.spy(); dblclickSpy = sinon.spy();
goog.events.listen(handler, 'dblclick', dblclickSpy); goog.events.listen(handler, 'dblclick', dblclickSpy);
@@ -24,29 +24,29 @@ describe('ol.MapBrowserEventHandler', function() {
it('emulates click', function() { it('emulates click', function() {
handler.emulateClick_(); handler.emulateClick_();
expect(clickSpy.called).to.not.be.ok(); expect(singleclickSpy.called).to.not.be.ok();
expect(dblclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok();
clock.tick(250); clock.tick(250);
expect(clickSpy.calledOnce).to.be.ok(); expect(singleclickSpy.calledOnce).to.be.ok();
expect(dblclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok();
handler.emulateClick_(); handler.emulateClick_();
expect(clickSpy.calledOnce).to.be.ok(); expect(singleclickSpy.calledOnce).to.be.ok();
expect(dblclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok();
}); });
it('emulates dblclick', function() { it('emulates dblclick', function() {
handler.emulateClick_(); handler.emulateClick_();
expect(clickSpy.called).to.not.be.ok(); expect(singleclickSpy.called).to.not.be.ok();
expect(dblclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok();
handler.emulateClick_(); handler.emulateClick_();
expect(clickSpy.called).to.not.be.ok(); expect(singleclickSpy.called).to.not.be.ok();
expect(dblclickSpy.calledOnce).to.be.ok(); expect(dblclickSpy.calledOnce).to.be.ok();
clock.tick(250); clock.tick(250);
expect(clickSpy.called).to.not.be.ok(); expect(singleclickSpy.called).to.not.be.ok();
expect(dblclickSpy.calledOnce).to.be.ok(); expect(dblclickSpy.calledOnce).to.be.ok();
}); });