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

Merge layerFilter option into layers

Browse Source
This commit is contained in:
Frederic Junod
2014-04-22 09:04:50 +02:00
parent 2c7282d4e9
commit 3c308af91f
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,18 +55,20 @@ ol.interaction.Select = function(opt_options) {
options.toggleCondition : ol.events.condition.shiftKeyOnly;
var layerFilter;
if (goog.isDef(options.layerFilter)) {
layerFilter = options.layerFilter;
} else if (goog.isDef(options.layers)) {
var layers = options.layers;
layerFilter =
/**
* @param {ol.layer.Layer} layer Layer.
* @return {boolean} Include.
*/
function(layer) {
return goog.array.contains(layers, layer);
};
if (goog.isDef(options.layers)) {
if (goog.isFunction(options.layers)) {
layerFilter = options.layers;
} else {
var layers = options.layers;
layerFilter =
/**
* @param {ol.layer.Layer} layer Layer.
* @return {boolean} Include.
*/
function(layer) {
return goog.array.contains(layers, layer);
};
}
} else {
layerFilter = goog.functions.TRUE;
}