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

Merge pull request #147 from marcjansen/goog.now

Browse Source 
Use goog.now() instead of Date.now().
This commit is contained in:
Marc Jansen
2013-01-22 03:13:15 -08:00
parent a1ff01e7a5 8d979127fc
commit 577fc86684
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/animation.js
View File

@@ -17,7 +17,7 @@ goog.require('ol.easing');
*/ */
ol.animation.createBounce = ol.animation.createBounce =
function(resolution, opt_duration, opt_start, opt_easingFunction) { function(resolution, opt_duration, opt_start, opt_easingFunction) {
var start = goog.isDef(opt_start) ? opt_start : Date.now(); var start = goog.isDef(opt_start) ? opt_start : goog.now();
var duration = goog.isDef(opt_duration) ? opt_duration : 1000; var duration = goog.isDef(opt_duration) ? opt_duration : 1000;
var easingFunction = goog.isDef(opt_easingFunction) ? var easingFunction = goog.isDef(opt_easingFunction) ?
opt_easingFunction : ol.easing.upAndDown; opt_easingFunction : ol.easing.upAndDown;
@@ -49,7 +49,7 @@ ol.animation.createBounce =
*/ */
ol.animation.createPanFrom = ol.animation.createPanFrom =
function(source, opt_duration, opt_start, opt_easingFunction) { function(source, opt_duration, opt_start, opt_easingFunction) {
var start = goog.isDef(opt_start) ? opt_start : Date.now(); var start = goog.isDef(opt_start) ? opt_start : goog.now();
var sourceX = source.x; var sourceX = source.x;
var sourceY = source.y; var sourceY = source.y;
var duration = goog.isDef(opt_duration) ? opt_duration : 1000; var duration = goog.isDef(opt_duration) ? opt_duration : 1000;
@@ -85,7 +85,7 @@ ol.animation.createPanFrom =
*/ */
ol.animation.createSpin = ol.animation.createSpin =
function(opt_duration, opt_turns, opt_start, opt_easingFunction) { function(opt_duration, opt_turns, opt_start, opt_easingFunction) {
var start = goog.isDef(opt_start) ? opt_start : Date.now(); var start = goog.isDef(opt_start) ? opt_start : goog.now();
var duration = goog.isDef(opt_duration) ? opt_duration : 1000; var duration = goog.isDef(opt_duration) ? opt_duration : 1000;
var turns = goog.isDef(opt_turns) ? opt_turns : 1; var turns = goog.isDef(opt_turns) ? opt_turns : 1;
var deltaTheta = 2 * turns * Math.PI; var deltaTheta = 2 * turns * Math.PI;
@@ -118,7 +118,7 @@ ol.animation.createSpin =
*/ */
ol.animation.createZoomFrom = ol.animation.createZoomFrom =
function(sourceResolution, opt_duration, opt_start, opt_easingFunction) { function(sourceResolution, opt_duration, opt_start, opt_easingFunction) {
var start = goog.isDef(opt_start) ? opt_start : Date.now(); var start = goog.isDef(opt_start) ? opt_start : goog.now();
var duration = goog.isDef(opt_duration) ? opt_duration : 1000; var duration = goog.isDef(opt_duration) ? opt_duration : 1000;
var easingFunction = goog.isDef(opt_easingFunction) ? var easingFunction = goog.isDef(opt_easingFunction) ?
opt_easingFunction : ol.easing.linear; opt_easingFunction : ol.easing.linear;