aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/cobalt.js10
-rw-r--r--package.json2
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",