@kevinburke/flot 5.0.0 → 5.1.1

package/source/jquery.flot.js

@@ -362,7 +362,7 @@ import { drawSeries as drawSeriesModule } from './jquery.flot.drawSeries.js';
         // initialize
         var MINOR_TICKS_COUNT_CONSTANT = uiConstants.MINOR_TICKS_COUNT_CONSTANT;
         var TICK_LENGTH_CONSTANT = uiConstants.TICK_LENGTH_CONSTANT;
-        initPlugins(plot);
+        initPlugins();
         setupCanvases();
         parseOptions(options_);
         setData(data_);
@@ -1660,8 +1660,11 @@ import { drawSeries as drawSeriesModule } from './jquery.flot.drawSeries.js';
                     };
 
                     // we might need an extra decimal since forced
-                    // ticks don't necessarily fit naturally
-                    if (!axis.mode && opts.tickDecimals == null) {
+                    // ticks don't necessarily fit naturally.
+                    // Guard against axis.delta <= 0 (min == max): Math.log(0)
+                    // is -Infinity, so extraDec would be +Infinity and
+                    // toFixed(Infinity) throws. Upstream #1869 / PR #1870.
+                    if (!axis.mode && opts.tickDecimals == null && axis.delta > 0) {
                         var extraDec = Math.max(0, -Math.floor(Math.log(axis.delta) / Math.LN10) + 1),
                             ts = axis.tickGenerator(axis, plot);
 
@@ -1879,6 +1882,8 @@ import { drawSeries as drawSeriesModule } from './jquery.flot.drawSeries.js';
                     markings = markings(axes);
                 }
 
+                if (!markings) return;
+
                 var i;
                 for (i = 0; i < markings.length; ++i) {
                     var m = markings[i],
@@ -2231,7 +2236,7 @@ import { drawSeries as drawSeriesModule } from './jquery.flot.drawSeries.js';
                 }
 
                 if (axis.gridLines === true) {
-                    drawGridLines(axis, bw);
+                    drawGridLines(axis);
                 }
             }
 
@@ -2574,7 +2579,13 @@ import { drawSeries as drawSeriesModule } from './jquery.flot.drawSeries.js';
                 maxy = maxDistance / series.yaxis.scale,
                 points = series.datapoints.points,
                 ps = series.datapoints.pointsize,
-                smallestDistance = Number.POSITIVE_INFINITY;
+                // Seed with maxDistance (or its square, matching the
+                // default squared-distance metric) so points outside
+                // the hover radius are never selected. Without this,
+                // the maxx/maxy coordinate-space pre-filter is the
+                // only radius check, and it's disabled for axes with
+                // inverseTransform — see upstream flot/flot#1871.
+                smallestDistance = computeDistance ? maxDistance : maxDistance * maxDistance;
 
             // with inverse transforms, we can't use the maxx/maxy
             // optimization, sadly
@@ -2774,7 +2785,16 @@ import { drawSeries as drawSeriesModule } from './jquery.flot.drawSeries.js';
             } else {
                 // assume this is a gradient spec; IE currently only
                 // supports a simple vertical gradient properly, so that's
-                // what we support too
+                // what we support too.
+                // createLinearGradient throws if any coordinate is NaN or
+                // ±Infinity (e.g. when the plot container has zero size
+                // or the user supplies bogus bounds) — fall back to the
+                // default solid color instead. Global isFinite coerces
+                // null → 0 (finite), matching the drawSeriesPoints path
+                // that passes (null, null). Upstream flot/flot#1867.
+                if (!isFinite(top) || !isFinite(bottom)) {
+                    return defaultColor;
+                }
                 var gradient = ctx.createLinearGradient(0, top, 0, bottom);
 
                 for (var i = 0, l = spec.colors.length; i < l; ++i) {
@@ -2802,7 +2822,7 @@ import { drawSeries as drawSeriesModule } from './jquery.flot.drawSeries.js';
     // Plugin registry. Plugins push to this array to register themselves.
     export var plugins = [];
 
-    export var version = "5.0.0";
+    export var version = "5.1.1";
 
     // The main plot function.
     export function plot(placeholder, data, options) {

package/source/jquery.flot.legend.js

@@ -119,6 +119,17 @@ import { plugins } from './jquery.flot.js';
                 shape.strokeWidth = entry.options.points.lineWidth;
                 iconHtml += getEntryIconHtml(shape);
             }
+            // fallback for plugin-drawn series (pie, errorbars, etc.)
+            // that don't turn on any of lines/bars/points — without
+            // this the legend entry has a label but no icon. Upstream
+            // flot/flot#1641, minus the switch to `else if` so series
+            // that deliberately overlay (e.g. lines + points) keep
+            // rendering both icons.
+            if (iconHtml === '') {
+                shape.name = 'box';
+                shape.fillColor = entry.color;
+                iconHtml += getEntryIconHtml(shape);
+            }
 
             labelHtml = '<text x="' + shape.xPos + '" y="' + shape.yPos + '" text-anchor="start"><tspan dx="2em" dy="1.2em">' + shape.label + '</tspan></text>'
             html[j++] = '<g>' + iconHtml + labelHtml + '</g>';
@@ -158,9 +169,17 @@ import { plugins } from './jquery.flot.js';
             legendEl.style.pointerEvents = 'none';
             placeholder.appendChild(legendEl);
         } else {
-            options.legend.container.innerHTML = html.join('');
-            options.legend.container.style.width = width + 'px';
-            options.legend.container.style.height = height + 'em';
+            // Accept either a DOM Element or a jQuery-wrapped container.
+            // Upstream flot/flot#1750 switched to `$(container).get(0)` to
+            // always land on the underlying element; since this fork is
+            // jQuery-optional, do the unwrap inline.
+            var container = options.legend.container;
+            if (container && typeof container.get === 'function' && container[0]) {
+                container = container[0];
+            }
+            container.innerHTML = html.join('');
+            container.style.width = width + 'px';
+            container.style.height = height + 'em';
         }
     }
 
@@ -254,6 +273,14 @@ import { plugins } from './jquery.flot.js';
                     'width="1.5em" height="1.5em"' +
                     '/>';
                 break;
+            case 'box':
+                html = '<use xlink:href="#box" class="legendIcon" ' +
+                    'x="' + x + '" ' +
+                    'y="' + y + '" ' +
+                    'fill="' + fill + '" ' +
+                    'width="1.5em" height="1.5em"' +
+                    '/>';
+                break;
             default:
                 // default is circle
                 html = '<use xlink:href="#circle" class="legendIcon" ' +
@@ -276,6 +303,12 @@ import { plugins } from './jquery.flot.js';
                 '<polyline points="0,15 5,5 10,10 15,0"/>' +
             '</symbol>' +
 
+            // Fallback icon for plugin-drawn series that don't turn on
+            // any of lines / bars / points. Upstream flot/flot#1641.
+            '<symbol id="box" stroke-width="1" viewBox="-5 -5 25 25">' +
+                '<rect x="0" y="0" width="15" height="15"/>' +
+            '</symbol>' +
+
             '<symbol id="area" stroke-width="1" viewBox="-5 -5 25 25">' +
                 '<polyline points="0,15 5,5 10,10 15,0, 15,15, 0,15"/>' +
             '</symbol>' +

package/source/jquery.flot.navigate.js

@@ -555,6 +555,17 @@ import { bind, unbind, trigger, css } from './helpers.js';
                 var minD = axis.p2c(opts.panRange[0]) - axis.p2c(axis.min);
                 // calc max delta (revealing right edge of plot)
                 var maxD = axis.p2c(opts.panRange[1]) - axis.p2c(axis.max);
+                // For the y-axis, screen coordinates are inverted
+                // (p2c(smaller v) > p2c(larger v)), so minD/maxD end up
+                // with the opposite signs from the x-axis case. Swap
+                // them so the clamp comparisons below keep their
+                // x-axis semantics. Upstream flot/flot#1789, ports the
+                // minimal form of PR #1793.
+                if (axis.direction === 'y') {
+                    var swap = minD;
+                    minD = maxD;
+                    maxD = swap;
+                }
                 // limit delta to min or max if enabled
                 if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
                 if (opts.panRange[1] !== undefined && d <= minD) d = minD;
@@ -719,6 +730,13 @@ import { bind, unbind, trigger, css } from './helpers.js';
                 var minD = p + axis.p2c(opts.panRange[0]) - axis.p2c(axisMin);
                 // calc max delta (revealing right edge of plot)
                 var maxD = p + axis.p2c(opts.panRange[1]) - axis.p2c(axisMax);
+                // Same y-axis swap as plot.pan — see comment there.
+                // Upstream flot/flot#1789 / PR #1793.
+                if (axis.direction === 'y') {
+                    var swap = minD;
+                    minD = maxD;
+                    maxD = swap;
+                }
                 // limit delta to min or max if enabled
                 if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
                 if (opts.panRange[1] !== undefined && d <= minD) d = minD;

package/source/jquery.flot.pie.js

@@ -141,7 +141,7 @@ import { extend, bind, unbind, trigger, width, height } from './helpers.js';
         plot.hooks.processDatapoints.push(function(plot, series, data, datapoints) {
             var options = plot.getOptions();
             if (options.series.pie.show) {
-                processDatapoints(plot, series, data, datapoints);
+                processDatapoints(plot, series, datapoints);
             }
         });
 
@@ -539,6 +539,11 @@ import { extend, bind, unbind, trigger, width, height } from './helpers.js';
         // Placed here because it needs to be accessed from multiple locations
 
         function drawDonutHole(layer) {
+            // The closure-scoped `options` is set by the processDatapoints
+            // hook on first draw, but drawDonutHole can be reached from
+            // paths that fire before that hook, leaving `options` null.
+            // Read it eagerly. Upstream flot/flot#1559.
+            var options = plot.getOptions();
             if (options.series.pie.innerRadius > 0) {
                 // subtract the center
                 layer.save();
@@ -651,6 +656,9 @@ import { extend, bind, unbind, trigger, width, height } from './helpers.js';
         // trigger click or hover event (they send the same parameters so we share their code)
 
         function triggerClickHoverEvent(eventname, e) {
+            // See drawDonutHole above: read `options` fresh in case the
+            // event fires before processDatapoints has run.
+            var options = plot.getOptions();
             var offset = plot.offset();
             var canvasX = parseInt(e.pageX - offset.left);
             var canvasY = parseInt(e.pageY - offset.top);

package/source/jquery.flot.threshold.js

@@ -76,7 +76,7 @@ import { extend } from './helpers.js';
                 if (y < below) p = threspoints;
                 else p = newpoints;
 
-                if (addCrossingPoints && prevp !== p &&
+                if (addCrossingPoints && prevp !== undefined && prevp !== p &&
                     x !== null && i > 0 &&
                     origpoints[i - ps] != null) {
                     var interx = x + (below - y) * (x - origpoints[i - ps]) / (y - origpoints[i - ps + 1]);