From 05da0ceaab92bc3d477c8cecbcf6161ecd38890a Mon Sep 17 00:00:00 2001 From: Marc Jansen Date: Wed, 23 Sep 2015 13:18:03 +0200 Subject: [PATCH] Use ol.isDef when testing options.duration --- src/ol/animation.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ol/animation.js b/src/ol/animation.js index 9539d7c27b..c0f4986afd 100644 --- a/src/ol/animation.js +++ b/src/ol/animation.js @@ -1,5 +1,6 @@ goog.provide('ol.animation'); +goog.require('ol'); goog.require('ol.PreRenderFunction'); goog.require('ol.ViewHint'); goog.require('ol.coordinate'); @@ -16,7 +17,7 @@ goog.require('ol.easing'); ol.animation.bounce = function(options) { var resolution = options.resolution; var start = options.start ? options.start : goog.now(); - var duration = options.duration ? options.duration : 1000; + var duration = ol.isDef(options.duration) ? options.duration : 1000; var easing = options.easing ? options.easing : ol.easing.upAndDown; return ( @@ -54,7 +55,7 @@ ol.animation.pan = function(options) { var start = options.start ? options.start : goog.now(); var sourceX = source[0]; var sourceY = source[1]; - var duration = options.duration ? options.duration : 1000; + var duration = ol.isDef(options.duration) ? options.duration : 1000; var easing = options.easing ? options.easing : ol.easing.inAndOut; return ( @@ -92,7 +93,7 @@ ol.animation.pan = function(options) { ol.animation.rotate = function(options) { var sourceRotation = options.rotation ? options.rotation : 0; var start = options.start ? options.start : goog.now(); - var duration = options.duration ? options.duration : 1000; + var duration = ol.isDef(options.duration) ? options.duration : 1000; var easing = options.easing ? options.easing : ol.easing.inAndOut; var anchor = options.anchor ? @@ -138,7 +139,7 @@ ol.animation.rotate = function(options) { ol.animation.zoom = function(options) { var sourceResolution = options.resolution; var start = options.start ? options.start : goog.now(); - var duration = options.duration ? options.duration : 1000; + var duration = ol.isDef(options.duration) ? options.duration : 1000; var easing = options.easing ? options.easing : ol.easing.inAndOut; return (