From 21f3fab5802f0a8092df501e8c610e0f5403059a Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Fri, 19 Jul 2013 19:47:45 +0200 Subject: [PATCH] consolidate date processing a bit --- dygraph-utils.js | 24 ++++++++++++++++++++++++ dygraph.js | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dygraph-utils.js b/dygraph-utils.js index 263ece1..24e4bb6 100644 --- a/dygraph-utils.js +++ b/dygraph-utils.js @@ -486,6 +486,30 @@ Dygraph.hmsString_ = function(date) { }; /** + * Convert a JS date (millis since epoch) to YYYY/MM/DD + * @param {number} date The JavaScript date (ms since epoch) + * @return {string} A date of the form "YYYY/MM/DD" + * @private + */ +Dygraph.dateString_ = function(date) { + var zeropad = Dygraph.zeropad; + var d = new Date(date); + + // Get the year: + var year = "" + d.getFullYear(); + // Get a 0 padded month string + var month = zeropad(d.getMonth() + 1); //months are 0-offset, sigh + // Get a 0 padded day string + var day = zeropad(d.getDate()); + + var ret = ""; + var frac = d.getHours() * 3600 + d.getMinutes() * 60 + d.getSeconds(); + if (frac) ret = " " + Dygraph.hmsString_(date); + + return year + "/" + month + "/" + day + ret; +}; + +/** * Round a number to the specified number of digits past the decimal point. * @param {number} num The number to round * @param {number} places The number of decimals to which to round diff --git a/dygraph.js b/dygraph.js index cc856bc..41b6f28 100644 --- a/dygraph.js +++ b/dygraph.js @@ -187,30 +187,6 @@ Dygraph.numberAxisLabelFormatter = function(x, granularity, opts, g) { }; /** - * Convert a JS date (millis since epoch) to YYYY/MM/DD - * @param {Number} date The JavaScript date (ms since epoch) - * @return {String} A date of the form "YYYY/MM/DD" - * @private - */ -Dygraph.dateString_ = function(date) { - var zeropad = Dygraph.zeropad; - var d = new Date(date); - - // Get the year: - var year = "" + d.getFullYear(); - // Get a 0 padded month string - var month = zeropad(d.getMonth() + 1); //months are 0-offset, sigh - // Get a 0 padded day string - var day = zeropad(d.getDate()); - - var ret = ""; - var frac = d.getHours() * 3600 + d.getMinutes() * 60 + d.getSeconds(); - if (frac) ret = " " + Dygraph.hmsString_(date); - - return year + "/" + month + "/" + day + ret; -}; - -/** * @type {!Array.} * @private */ -- 2.7.4