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

Use ol.isDef when testing options.duration

Browse Source
This commit is contained in:
Marc Jansen
2015-09-23 13:18:03 +02:00
committed by Tim Schaub
parent 68442578ba
commit 05da0ceaab
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/animation.js
+5 -4
View File
@@ -1,5 +1,6 @@
goog.provide('ol.animation'); goog.provide('ol.animation');
goog.require('ol');
goog.require('ol.PreRenderFunction'); goog.require('ol.PreRenderFunction');
goog.require('ol.ViewHint'); goog.require('ol.ViewHint');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
@@ -16,7 +17,7 @@ goog.require('ol.easing');
ol.animation.bounce = function(options) { ol.animation.bounce = function(options) {
var resolution = options.resolution; var resolution = options.resolution;
var start = options.start ? options.start : goog.now(); 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 ? var easing = options.easing ?
options.easing : ol.easing.upAndDown; options.easing : ol.easing.upAndDown;
return ( return (
@@ -54,7 +55,7 @@ ol.animation.pan = function(options) {
var start = options.start ? options.start : goog.now(); var start = options.start ? options.start : goog.now();
var sourceX = source[0]; var sourceX = source[0];
var sourceY = source[1]; var sourceY = source[1];
var duration = options.duration ? options.duration : 1000; var duration = ol.isDef(options.duration) ? options.duration : 1000;
var easing = options.easing ? var easing = options.easing ?
options.easing : ol.easing.inAndOut; options.easing : ol.easing.inAndOut;
return ( return (
@@ -92,7 +93,7 @@ ol.animation.pan = function(options) {
ol.animation.rotate = function(options) { ol.animation.rotate = function(options) {
var sourceRotation = options.rotation ? options.rotation : 0; var sourceRotation = options.rotation ? options.rotation : 0;
var start = options.start ? options.start : goog.now(); 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 ? var easing = options.easing ?
options.easing : ol.easing.inAndOut; options.easing : ol.easing.inAndOut;
var anchor = options.anchor ? var anchor = options.anchor ?
@@ -138,7 +139,7 @@ ol.animation.rotate = function(options) {
ol.animation.zoom = function(options) { ol.animation.zoom = function(options) {
var sourceResolution = options.resolution; var sourceResolution = options.resolution;
var start = options.start ? options.start : goog.now(); 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 ? var easing = options.easing ?
options.easing : ol.easing.inAndOut; options.easing : ol.easing.inAndOut;
return ( return (