From 8555c0c671c420f2751aedd0a2397c6dd15b01db Mon Sep 17 00:00:00 2001 From: liabru Date: Wed, 20 May 2015 23:12:26 +0100 Subject: [PATCH] fixed Common.now, closes #55 --- src/core/Common.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/core/Common.js b/src/core/Common.js index ab7edc06..8721d4a0 100644 --- a/src/core/Common.js +++ b/src/core/Common.js @@ -213,15 +213,19 @@ var Common = {}; Common.now = function() { // http://stackoverflow.com/questions/221294/how-do-you-get-a-timestamp-in-javascript // https://gist.github.com/davidwaterston/2982531 - - var perf = window.performance; - if (perf) { - perf.now = perf.now || perf.webkitNow || perf.msNow || perf.oNow || perf.mozNow; - return +(perf.now()); - } - - return +(new Date()); + var performance = window.performance || {}; + + performance.now = (function() { + return performance.now || + performance.webkitNow || + performance.msNow || + performance.oNow || + performance.mozNow || + function() { return +(new Date()); }; + })(); + + return performance.now(); };