Change the interaction condition signature

This commit is contained in:
Éric Lemoine
2013-09-12 18:08:01 +02:00
parent daddc61dc6
commit ba3f97d50a
8 changed files with 36 additions and 29 deletions

View File

@@ -56,15 +56,15 @@ goog.inherits(ol.interaction.Select, ol.interaction.Interaction);
/**
* @inheritDoc.
*/
ol.interaction.Select.prototype.handleMapBrowserEvent = function(evt) {
var browserEvent = evt.browserEvent;
if (this.condition_(browserEvent)) {
var map = evt.map;
ol.interaction.Select.prototype.handleMapBrowserEvent =
function(mapBrowserEvent) {
if (this.condition_(mapBrowserEvent)) {
var map = mapBrowserEvent.map;
var layers = map.getLayerGroup().getLayersArray();
if (!goog.isNull(this.layerFilter_)) {
layers = goog.array.filter(layers, this.layerFilter_);
}
var clear = !ol.interaction.condition.shiftKeyOnly(browserEvent);
var clear = !ol.interaction.condition.shiftKeyOnly(mapBrowserEvent);
var that = this;
var select = function(featuresByLayer) {
@@ -73,7 +73,7 @@ ol.interaction.Select.prototype.handleMapBrowserEvent = function(evt) {
map.getFeatures({
layers: layers,
pixel: evt.getPixel(),
pixel: mapBrowserEvent.getPixel(),
success: select
});
}