From 42c029be84b430b1fc24da4da997491652a9efc6 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Sat, 6 Apr 2013 19:13:54 +0200
Subject: [PATCH] Be more consistent with interaction options

---
 src/objectliterals.exports     | 18 +++++++++---------
 src/ol/interaction/defaults.js |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/objectliterals.exports b/src/objectliterals.exports
index 3ec7c4af74..2232a836c6 100644
--- a/src/objectliterals.exports
+++ b/src/objectliterals.exports
@@ -99,15 +99,15 @@
 @exportObjectLiteralProperty ol.control.ZoomSliderOptions.maxResolution number|undefined
 @exportObjectLiteralProperty ol.control.ZoomSliderOptions.minResolution number|undefined
 
-@exportObjectLiteral ol.interaction.DefaultOptions
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.doubleClickZoom boolean|undefined
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.dragPan boolean|undefined
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.keyboard boolean|undefined
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.mouseWheelZoom boolean|undefined
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.shiftDragZoom boolean|undefined
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.touchPan boolean|undefined
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.touchRotate boolean|undefined
-@exportObjectLiteralProperty ol.interaction.DefaultOptions.touchZoom boolean|undefined
+@exportObjectLiteral ol.interaction.DefaultsOptions
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.doubleClickZoom boolean|undefined
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.dragPan boolean|undefined
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.keyboard boolean|undefined
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.mouseWheelZoom boolean|undefined
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.shiftDragZoom boolean|undefined
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.touchPan boolean|undefined
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.touchRotate boolean|undefined
+@exportObjectLiteralProperty ol.interaction.DefaultsOptions.touchZoom boolean|undefined
 
 @exportObjectLiteral ol.interaction.KeyboardPanOptions
 @exportObjectLiteralProperty ol.interaction.KeyboardPanOptions.pixelDelta number|undefined
diff --git a/src/ol/interaction/defaults.js b/src/ol/interaction/defaults.js
index c016b690bf..bfb1359e29 100644
--- a/src/ol/interaction/defaults.js
+++ b/src/ol/interaction/defaults.js
@@ -17,7 +17,7 @@ goog.require('ol.interaction.condition');
 
 
 /**
- * @param {ol.interaction.DefaultOptions=} opt_options Options.
+ * @param {ol.interaction.DefaultsOptions=} opt_options Defaults options.
  * @param {Array.<ol.interaction.Interaction>=} opt_interactions Additional
  *     interactions.
  * @return {ol.Collection} Interactions.