From cc33727fad9784062561da65df720f995c4d5a15 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 22 Apr 2013 15:33:25 +0200
Subject: [PATCH] Configure ol.interaction.KeyboardPan with options

---
 src/objectliterals.jsdoc                     | 1 +
 src/ol/interaction/interactiondefaults.js    | 3 +--
 src/ol/interaction/keyboardpaninteraction.js | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 8450016ed5..6d8a2ee656 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -203,6 +203,7 @@
 
 /**
  * @typedef {Object} ol.interaction.KeyboardPanOptions
+ * @property {ol.interaction.ConditionType|undefined} condition Condition.
  * @property {number|undefined} pixelDelta Pixel delta
  */
 
diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js
index 077bbd1fab..52a2acbf38 100644
--- a/src/ol/interaction/interactiondefaults.js
+++ b/src/ol/interaction/interactiondefaults.js
@@ -72,8 +72,7 @@ ol.interaction.defaults = function(opt_options, opt_interactions) {
   var keyboard = goog.isDef(options.keyboard) ?
       options.keyboard : true;
   if (keyboard) {
-    interactions.push(new ol.interaction.KeyboardPan(
-        ol.interaction.condition.noModifierKeys));
+    interactions.push(new ol.interaction.KeyboardPan());
     interactions.push(new ol.interaction.KeyboardZoom(
         ol.interaction.condition.noModifierKeys));
   }
diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js
index cdea2a6ac8..d5f6fc9a93 100644
--- a/src/ol/interaction/keyboardpaninteraction.js
+++ b/src/ol/interaction/keyboardpaninteraction.js
@@ -9,6 +9,7 @@ goog.require('ol.View2D');
 goog.require('ol.coordinate');
 goog.require('ol.interaction.ConditionType');
 goog.require('ol.interaction.Interaction');
+goog.require('ol.interaction.condition');
 
 
 /**
@@ -21,10 +22,9 @@ ol.interaction.KEYBOARD_PAN_DURATION = 100;
 /**
  * @constructor
  * @extends {ol.interaction.Interaction}
- * @param {ol.interaction.ConditionType} condition Condition.
  * @param {ol.interaction.KeyboardPanOptions=} opt_options Options.
  */
-ol.interaction.KeyboardPan = function(condition, opt_options) {
+ol.interaction.KeyboardPan = function(opt_options) {
 
   goog.base(this);
 
@@ -34,7 +34,8 @@ ol.interaction.KeyboardPan = function(condition, opt_options) {
    * @private
    * @type {ol.interaction.ConditionType}
    */
-  this.condition_ = condition;
+  this.condition_ = goog.isDef(options.condition) ?
+      options.condition : ol.interaction.condition.noModifierKeys;
 
   /**
    * @private