Merge pull request #851 from ncb000gt/master

Prevent insertSteps and fmt from becoming global.
14 years ago · 30946cb91d
parent 63266b363a 414e7dec14
commit 30946cb91d
2 changed files with 2 additions and 1 deletions
--- 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) {
--- 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) {