Merge pull request #861 from thecountofzero/master

Ensure that tickSize updates on subsequent calls to setupGrid.

jquery.flot.js

@@ -1274,14 +1274,22 @@ Licensed under the MIT license.
 
             if (!axis.tickGenerator) {
 
-                var maxDec = opts.tickDecimals;
-                var dec = -Math.floor(Math.log(axis.delta) / Math.LN10);
+                axis.tickGenerator = function (axis) {
+                    var maxDec = opts.tickDecimals,
+                        dec = -Math.floor(Math.log(axis.delta) / Math.LN10);
+
                     if (maxDec != null && dec > maxDec)
                         dec = maxDec;
 
-                var magn = Math.pow(10, -dec);
-                var norm = axis.delta / magn; // norm is between 1.0 and 10.0
-                var size;
+                    var magn = Math.pow(10, -dec),
+                        norm = axis.delta / magn, // norm is between 1.0 and 10.0
+                        size,
+
+                        ticks = [],
+                        start,
+                        i = 0,
+                        v = Number.NaN,
+                        prev;
 
                     if (norm < 1.5)
                         size = 1;
@@ -1305,9 +1313,8 @@ Licensed under the MIT license.
                     axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
                     axis.tickSize = opts.tickSize || size;
 
-                axis.tickGenerator = function (axis) {
-                    var ticks = [], start = floorInBase(axis.min, axis.tickSize),
-                        i = 0, v = Number.NaN, prev;
+                    start = floorInBase(axis.min, axis.tickSize)
+
                     do {
                         prev = v;
                         v = start + i * axis.tickSize;