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

Add support for passing interactions as an array for consistency.

Browse Source
This commit is contained in:
Paul Spencer
2013-11-01 08:03:06 -04:00
parent 0f71323c05
commit 7df3c7506f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/objectliterals.jsdoc
View File

@@ -57,9 +57,8 @@
* @typedef {Object} ol.MapOptions * @typedef {Object} ol.MapOptions
* @property {ol.Collection|Array.<ol.control.Control>|undefined} controls * @property {ol.Collection|Array.<ol.control.Control>|undefined} controls
* Controls initially added to the map. * Controls initially added to the map.
* @property {ol.Collection|undefined} interactions A collection of * @property {ol.Collection|Array.<ol.interaction.Interaction>|undefined}
* {@link ol.interaction|ol.interaction.Interaction} instances that allow the user to interact with * interactions Interactions that are initially added to the map.
* the map.
* @property {Array.<ol.layer.Base>|ol.Collection|undefined} layers Layers. * @property {Array.<ol.layer.Base>|ol.Collection|undefined} layers Layers.
* @property {ol.Collection|Array.<ol.Overlay>|undefined} overlays * @property {ol.Collection|Array.<ol.Overlay>|undefined} overlays
* Overlays initially added to the map. * Overlays initially added to the map.

13
src/ol/map.js
View File

@@ -1274,8 +1274,17 @@ ol.Map.createOptionsInternal = function(options) {
controls = ol.control.defaults(); controls = ol.control.defaults();
} }
var interactions = goog.isDef(options.interactions) ? var interactions;
options.interactions : ol.interaction.defaults(); if (goog.isDef(options.interactions)) {
if (goog.isArray(options.interactions)) {
interactions = new ol.Collection(goog.array.clone(options.interactions));
} else {
goog.asserts.assertInstanceof(options.interactions, ol.Collection);
interactions = options.interactions;
}
} else {
interactions = ol.interaction.defaults();
}
var overlays; var overlays;
if (goog.isDef(options.overlays)) { if (goog.isDef(options.overlays)) {