From 0d2c9ec71440681bfc2bee285f9dae504426e331 Mon Sep 17 00:00:00 2001 From: Nick Campbell Date: Thu, 1 Nov 2012 15:47:42 -0400 Subject: [PATCH 1/2] insertSteps was being hoisted to global. Locally declared insertSteps by adding var s.t. it would no longer be a global variable. Signed-off-by: Nick Campbell --- jquery.flot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.flot.js b/jquery.flot.js index 9aa9ad3..e02c782 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -561,7 +561,7 @@ ps = s.datapoints.pointsize; points = s.datapoints.points; - insertSteps = s.lines.show && s.lines.steps; + var insertSteps = s.lines.show && s.lines.steps; s.xaxis.used = s.yaxis.used = true; for (j = k = 0; j < data.length; ++j, k += ps) { From 414e7dec14ef36389b9c622ba96a575673444e37 Mon Sep 17 00:00:00 2001 From: Nick Campbell Date: Thu, 1 Nov 2012 15:55:08 -0400 Subject: [PATCH 2/2] fmt hoisted to global. `fmt` was being hoisted as a global variable. Signed-off-by: Nick Campbell --- jquery.flot.time.js | 1 + 1 file changed, 1 insertion(+) diff --git a/jquery.flot.time.js b/jquery.flot.time.js index dfe7244..cfe5245 100644 --- a/jquery.flot.time.js +++ b/jquery.flot.time.js @@ -272,6 +272,7 @@ for details. var suffix = (opts.twelveHourClock) ? " %p" : ""; var hourCode = (opts.twelveHourClock) ? "%I" : "%H"; + var fmt; if (t < timeUnitSize.minute) fmt = hourCode + ":%M:%S" + suffix; else if (t < timeUnitSize.day) {