diff options
| author | Ben Beltran <ben@freshout.us> | 2013-05-13 11:09:25 -0500 |
|---|---|---|
| committer | Ben Beltran <ben@freshout.us> | 2013-05-13 11:09:25 -0500 |
| commit | adc1a8da06f8af4c06a311ca459de4dcf379f5fd (patch) | |
| tree | 39562f3cf44001b421b864f9a8c5093da1f0e298 | |
| parent | e16e2dbf4c0911a5d5e8d1d56bb1c674b37fc161 (diff) | |
Proper nows now
| -rw-r--r-- | lib/cobalt.js | 10 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/cobalt.js b/lib/cobalt.js index 58a305c..17e6948 100644 --- a/lib/cobalt.js +++ b/lib/cobalt.js @@ -239,7 +239,15 @@ // Returns the current time in microseconds. now : function () { - this.constructor.now(); + if (typeof performance !== 'undefined' && performance.timing) { + return performance.timing.navigationStart + performance.now(); + } + + if (typeof Microtime !== 'undefined') { + return Microtime.nowDouble() * 1000; + } + + return Date.now(); }, _levelString : function (level) { diff --git a/package.json b/package.json index c384de4..ca81d08 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "url" : "http://github.com/ktlacaelel" } ], - "version" : "0.1.5", + "version" : "0.1.6", "dependencies" : { "neon" : "1.0.x", "socket.io" : "0.9.x", |