flot
Advanced tools
Comparing version 3.2.12 to 3.2.13
{ | ||
"name": "flot", | ||
"version": "3.2.12", | ||
"version": "3.2.13", | ||
"main": "dist/es5/jquery.flot.js", | ||
@@ -5,0 +5,0 @@ "scripts": { |
@@ -40,4 +40,3 @@ /* Pretty handling of time axes. | ||
// Microseconds are stored as integers | ||
var seconds = microEpoch/1000; | ||
this.microseconds = 1000000 * (seconds - Math.floor(seconds)); | ||
this.microseconds = 1000 * (microEpoch - Math.floor(microEpoch)); | ||
}; | ||
@@ -60,3 +59,2 @@ | ||
newDate.setMicroseconds = function(microseconds) { | ||
// Replace the microsecond part (6 last digits) in microEpoch | ||
var epochWithoutMicroseconds = oldGetTime(); | ||
@@ -91,12 +89,14 @@ var newEpoch = epochWithoutMicroseconds + microseconds/1000; | ||
var formatMicroseconds = function(n, dec) { | ||
if (dec < 6 && dec > 0) { | ||
var magnitude = parseFloat('1e' + (dec-6)); | ||
n = Math.round(Math.round(n*magnitude)/magnitude); | ||
n = ('00000' + n).slice(-6,-(6 - dec)); | ||
var formatSubSeconds = function(milliseconds, microseconds, numberDecimalPlaces) { | ||
var totalMicroseconds = milliseconds * 1000 + microseconds; | ||
var formattedString; | ||
if (numberDecimalPlaces < 6 && numberDecimalPlaces > 0) { | ||
var magnitude = parseFloat('1e' + (numberDecimalPlaces - 6)); | ||
totalMicroseconds = Math.round(Math.round(totalMicroseconds * magnitude) / magnitude); | ||
formattedString = ('00000' + totalMicroseconds).slice(-6,-(6 - numberDecimalPlaces)); | ||
} else { | ||
n = Math.round(n) | ||
n = ('00000' + n).slice(-6); | ||
totalMicroseconds = Math.round(totalMicroseconds) | ||
formattedString = ('00000' + totalMicroseconds).slice(-6); | ||
} | ||
return n; | ||
return formattedString; | ||
}; | ||
@@ -148,3 +148,3 @@ | ||
case 'S': c = leftPad(d.getSeconds()); break; | ||
case 's': c = "" + formatMicroseconds(d.getMicroseconds(),decimals); break; | ||
case 's': c = "" + formatSubSeconds(d.getMilliseconds(), d.getMicroseconds(), decimals); break; | ||
case 'y': c = leftPad(d.getFullYear() % 100); break; | ||
@@ -151,0 +151,0 @@ case 'Y': c = "" + d.getFullYear(); break; |
Sorry, the diff of this file is too big to display
983606