diff --git a/src/ol/animation.js b/src/ol/animation.js index 2051f01d47..9539d7c27b 100644 --- a/src/ol/animation.js +++ b/src/ol/animation.js @@ -15,9 +15,9 @@ goog.require('ol.easing'); */ ol.animation.bounce = function(options) { var resolution = options.resolution; - var start = goog.isDef(options.start) ? options.start : goog.now(); - var duration = goog.isDef(options.duration) ? options.duration : 1000; - var easing = goog.isDef(options.easing) ? + var start = options.start ? options.start : goog.now(); + var duration = options.duration ? options.duration : 1000; + var easing = options.easing ? options.easing : ol.easing.upAndDown; return ( /** @@ -51,11 +51,11 @@ ol.animation.bounce = function(options) { */ ol.animation.pan = function(options) { var source = options.source; - var start = goog.isDef(options.start) ? options.start : goog.now(); + var start = options.start ? options.start : goog.now(); var sourceX = source[0]; var sourceY = source[1]; - var duration = goog.isDef(options.duration) ? options.duration : 1000; - var easing = goog.isDef(options.easing) ? + var duration = options.duration ? options.duration : 1000; + var easing = options.easing ? options.easing : ol.easing.inAndOut; return ( /** @@ -90,12 +90,12 @@ ol.animation.pan = function(options) { * @api */ ol.animation.rotate = function(options) { - var sourceRotation = goog.isDef(options.rotation) ? options.rotation : 0; - var start = goog.isDef(options.start) ? options.start : goog.now(); - var duration = goog.isDef(options.duration) ? options.duration : 1000; - var easing = goog.isDef(options.easing) ? + var sourceRotation = options.rotation ? options.rotation : 0; + var start = options.start ? options.start : goog.now(); + var duration = options.duration ? options.duration : 1000; + var easing = options.easing ? options.easing : ol.easing.inAndOut; - var anchor = goog.isDef(options.anchor) ? + var anchor = options.anchor ? options.anchor : null; return ( @@ -137,9 +137,9 @@ ol.animation.rotate = function(options) { */ ol.animation.zoom = function(options) { var sourceResolution = options.resolution; - var start = goog.isDef(options.start) ? options.start : goog.now(); - var duration = goog.isDef(options.duration) ? options.duration : 1000; - var easing = goog.isDef(options.easing) ? + var start = options.start ? options.start : goog.now(); + var duration = options.duration ? options.duration : 1000; + var easing = options.easing ? options.easing : ol.easing.inAndOut; return ( /**