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

Merge pull request #4272 from adube/fix-interactiondefaults-zoomduration

Browse Source 
Allow the DragZoom interaction created in defaults to use zoomDuration option.
This commit is contained in:
Andreas Hocevar
2015-10-14 21:08:38 +02:00
parent 257313969c 657b9dc018
commit 16b3893166
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externs/olx.js
+2 -2
View File
@@ -2366,7 +2366,7 @@ olx.interaction.DragRotateOptions.prototype.duration;
/** /**
* @typedef {{condition: (ol.events.ConditionType|undefined), * @typedef {{condition: (ol.events.ConditionType|undefined),
* duration: (number|undefined), * duration: (number|undefined),
* style: ol.style.Style}} * style: (ol.style.Style|undefined)}}
* @api * @api
*/ */
olx.interaction.DragZoomOptions; olx.interaction.DragZoomOptions;
@@ -2392,7 +2392,7 @@ olx.interaction.DragZoomOptions.prototype.duration;
/** /**
* Style for the box. * Style for the box.
* @type {ol.style.Style} * @type {ol.style.Style|undefined}
* @api * @api
*/ */
olx.interaction.DragZoomOptions.prototype.style; olx.interaction.DragZoomOptions.prototype.style;
src/ol/interaction/interactiondefaults.js
+3 -1
View File
@@ -103,7 +103,9 @@ ol.interaction.defaults = function(opt_options) {
var shiftDragZoom = options.shiftDragZoom !== undefined ? var shiftDragZoom = options.shiftDragZoom !== undefined ?
options.shiftDragZoom : true; options.shiftDragZoom : true;
if (shiftDragZoom) { if (shiftDragZoom) {
interactions.push(new ol.interaction.DragZoom()); interactions.push(new ol.interaction.DragZoom({
duration: options.zoomDuration
}));
} }
return interactions; return interactions;