Merge pull request locutusjs#195 from duzun/master

kvz · kvz · commit 4984ea7249fa · 2014-11-14T16:16:52.000+01:00
use performance.now() when available
diff --git a/functions/datetime/microtime.js b/functions/datetime/microtime.js
@@ -1,13 +1,26 @@
 function microtime(get_as_float) {
   //  discuss at: http://phpjs.org/functions/microtime/
   // original by: Paulo Freitas
+  // improved by Dumitru Uzun (http://duzun.me)
   //   example 1: timeStamp = microtime(true);
   //   example 1: timeStamp > 1000000000 && timeStamp < 2000000000
   //   returns 1: true
+  //   example 2: /^0\.[0-9]{1,6} [0-9]{10,10}$/.test(microtime())
+  //   returns 2: true
 
-  var now = new Date()
-    .getTime() / 1000;
-  var s = parseInt(now, 10);
 
-  return (get_as_float) ? now : (Math.round((now - s) * 1000) / 1000) + ' ' + s;
+    if ( typeof performance !== 'undefined' && performance.now ) {
+        var now = ( performance.now() + performance.timing.navigationStart ) / 1e3;
+        if(get_as_float) return now;
+
+        var s = now | 0; // Math.round(now)
+        return ( Math.round((now - s) * 1e6) / 1e6 ) + ' ' + s;
+    }
+    else {
+        var now = ( Date.now ? Date.now() : new Date().getTime() ) / 1e3;
+        if(get_as_float) return now;
+
+        var s = now | 0; // Math.round(now)
+        return ( Math.round((now - s) * 1e3) / 1e3 ) + ' ' + s;
+    }
 }
