Use an array to specify additional interactions

This commit is contained in:
Tom Payne
2013-03-06 13:19:50 +01:00
parent 363cb87e1a
commit 38eaa9cfb2

View File

@@ -18,10 +18,11 @@ goog.require('ol.interaction.condition');
/** /**
* @param {ol.interaction.DefaultOptions=} opt_options Options. * @param {ol.interaction.DefaultOptions=} opt_options Options.
* @param {...ol.interaction.Interaction} var_args Further interactions. * @param {Array.<ol.interaction.Interaction>=} opt_interactions Additional
* interactions.
* @return {ol.Collection} Interactions. * @return {ol.Collection} Interactions.
*/ */
ol.interaction.defaults = function(opt_options, var_args) { ol.interaction.defaults = function(opt_options, opt_interactions) {
var options = goog.isDef(opt_options) ? opt_options : {}; var options = goog.isDef(opt_options) ? opt_options : {};
@@ -91,9 +92,8 @@ ol.interaction.defaults = function(opt_options, var_args) {
new ol.interaction.DragZoom(ol.interaction.condition.shiftKeyOnly)); new ol.interaction.DragZoom(ol.interaction.condition.shiftKeyOnly));
} }
var i; if (goog.isDef(opt_interactions)) {
for (i = 1; i < arguments.length; ++i) { interactions.extend(opt_interactions);
interactions.push(arguments[i]);
} }
return interactions; return interactions;