@kevinburke/flot 5.1.0 → 5.1.2

package/CHANGELOG.md

@@ -5,6 +5,124 @@ All notable changes to this project will be documented in this file.
 Starting with 5.0.0, this changelog tracks the @kevinburke/flot fork.
 For earlier upstream history, see the [flot/flot repository](https://github.com/flot/flot).
 
+## [5.1.2] - 2026-04-22
+
+### Fixed
+
+- `jquery-adapter.js`: restore upstream flot/flot event-dispatch
+  semantics for consumers using `@kevinburke/flot/jquery` (or the
+  `jquery.flot.min.js` bundle). In 5.0.0, the fork's core switched to
+  native `CustomEvent` with extra args stashed on `event.detail`. That
+  is correct for the jQuery-free core, but broke every handler bound
+  through jQuery — `$(el).on("plothover", function(event, pos, item))`
+  silently received `undefined` for `pos` and `item`, because native
+  `dispatchEvent` does not spread args into jQuery handler positional
+  parameters. Same for `plotclick`, `plotselected`, `plotunselected`,
+  `plotselecting`, `plotzoom`, `plotpan`, `plotactivated`, and the pie
+  plugin's events.
+  Fixed by adding a `setTrigger()` hook in `helpers.js` and having the
+  jQuery adapter install a jQuery-aware trigger: arrays are dispatched
+  as `$(el).trigger(type, args)` (spreading into handler params);
+  non-array args are wrapped in a `$.Event` with `detail`, matching
+  upstream's `re-center` contract. The jQuery-free core path is
+  unchanged.
+  Added a browser regression test (`plothover handler receives pos
+  and item positional args`) that would have caught this.
+
+## [5.1.1] - 2026-04-15
+
+### Fixed
+
+All bug fixes in this release are ports or re-implementations of
+existing upstream work. Thanks to the reporters and submitters
+credited below.
+
+- `jquery.flot.js`: skip the `extraDec` branch in `setupTickGeneration`
+  when `axis.delta` is zero. Previously, a second `setupGrid()` call
+  (for example from the resize plugin) on an axis with `min === max`
+  and another axis using `alignTicksWithAxis` produced
+  `extraDec = +Infinity`, left `axis.tickDecimals` as `Infinity`, and
+  could throw `RangeError: toFixed() digits argument must be between
+  0 and 100` during tick formatting. Ports
+  [flot/flot#1870](https://github.com/flot/flot/pull/1870)
+  (@LYarnall) for
+  [flot/flot#1869](https://github.com/flot/flot/issues/1869).
+- `jquery.flot.js`: enforce `mouseActiveRadius` in `findNearbyPoint`
+  even when the pre-filter is disabled. Previously, seeding
+  `smallestDistance` with `+Infinity` meant the hover radius was only
+  enforced via the `maxx`/`maxy` coordinate-space pre-filter, which
+  is explicitly skipped for axes with `transform` /
+  `inverseTransform`. As a result, hovering anywhere in the plot
+  could highlight an arbitrarily distant point. Seed with
+  `maxDistance` (or its square, matching the default squared-distance
+  metric) so the radius is always an upper bound. Ports
+  [flot/flot#1872](https://github.com/flot/flot/pull/1872)
+  (@ErikSievers) for
+  [flot/flot#1871](https://github.com/flot/flot/issues/1871).
+- `jquery.flot.js`: guard `getColorOrGradient` against non-finite
+  coordinates. `ctx.createLinearGradient(0, top, 0, bottom)` throws
+  `Uncaught TypeError: Argument 4 is not finite floating-point value`
+  when `top` or `bottom` is `NaN` or `±Infinity`, which can happen
+  when the plot container has zero size or when bogus axis bounds
+  flow in. Fall back to `defaultColor` in that case. Fixes upstream
+  [flot/flot#1867](https://github.com/flot/flot/issues/1867)
+  (reported by @jzabate).
+- `jquery.flot.navigate.js`: panning on the y-axis with
+  `panRange` set no longer clamps the axis origin to
+  `panRange[0]`. Screen y coordinates run opposite to data y, so
+  the `minD` / `maxD` clamp bounds in `plot.pan` and `plot.smartPan`
+  needed to be swapped for y-axes. Fixes upstream
+  [flot/flot#1789](https://github.com/flot/flot/issues/1789)
+  (reported by @mjmlopes, diagnosed by @ecsv); ports the minimal
+  form of [flot/flot#1793](https://github.com/flot/flot/pull/1793)
+  (@netbymatt).
+- `jquery.flot.pie.js`: `drawDonutHole` and `triggerClickHoverEvent`
+  now read `options` via `plot.getOptions()` instead of relying on
+  the closure-scoped value, which is `null` until the
+  `processDatapoints` hook runs. Ports
+  [flot/flot#1559](https://github.com/flot/flot/pull/1559)
+  (@mnofresno; duplicate of
+  [flot/flot#1547](https://github.com/flot/flot/pull/1547)).
+- `jquery.flot.legend.js`: accept a jQuery-wrapped legend container,
+  not just a DOM element. Matches the intent of
+  [flot/flot#1750](https://github.com/flot/flot/pull/1750)
+  (@netbymatt, fixing
+  [flot/flot#1698](https://github.com/flot/flot/issues/1698)) but
+  inlines the unwrap since this fork is jQuery-optional.
+- `jquery.flot.legend.js`: render a fallback "box" icon for plugin-
+  drawn series (e.g. pie, errorbars) that don't turn on
+  `lines.show`, `bars.show`, or `points.show`. Previously these
+  legend entries showed the label with no icon. Ports the
+  substantive half of
+  [flot/flot#1641](https://github.com/flot/flot/pull/1641)
+  (@faizalluthfi, fixing
+  [flot/flot#1640](https://github.com/flot/flot/issues/1640)); the
+  upstream PR also switched the icon-selection chain to `else if`,
+  which would regress series that intentionally overlay (e.g. lines
+  with points) — that part is deliberately not ported.
+- `jquery.canvaswrapper.js`: guard against `positions == null` in
+  the text-cache iteration in `removeText`. Ports
+  [flot/flot#1444](https://github.com/flot/flot/pull/1444)
+  (@andig).
+
+### Changed
+
+- Dev dependency: jQuery 3.7.1 -> 4.0.0.
+- Dev dependency: Biome 1.9.4 -> 2.4.12 (includes config migration
+  to v2 format).
+- Dev dependency: Vitest 2.1.9 -> 4.1.4.
+- Dev dependency: happy-dom 15.11.7 -> 20.9.0.
+- Dev dependency: size-limit 12.0.1 -> 12.1.0,
+  @size-limit/file 12.0.1 -> 12.1.0.
+- CI: actions/checkout v4 -> v6, actions/setup-node v4 -> v6.
+
+### Thanks
+
+Thanks to everyone upstream who investigated, reported, and patched
+these bugs — the fixes in this release are direct ports of their
+work: @LYarnall, @ErikSievers, @jzabate, @mjmlopes, @ecsv,
+@netbymatt, @mnofresno, @faizalluthfi, @andig.
+
 ## [5.1.0] - 2026-04-14
 
 ### Added

package/dist/flot.js

@@ -1,4 +1,4 @@
-/*! @kevinburke/flot v5.1.0 | MIT License | https://github.com/kevinburke/flot */
+/*! @kevinburke/flot v5.1.2 | MIT License | https://github.com/kevinburke/flot */
 var Flot = (function (exports) {
     'use strict';
 
@@ -24,7 +24,7 @@ var Flot = (function (exports) {
         isSafari: function() {
             var top = window.top;
             if (!top) return false;
-            return /constructor/i.test(top.HTMLElement) || (function (p) { return p.toString() === "[object SafariRemoteNotification]"; })(!top['safari'] || (typeof top.safari !== 'undefined' && top.safari.pushNotification));
+            return /constructor/i.test(/** @type {any} */ (top.HTMLElement)) || (function (/** @type {any} */ p) { return p.toString() === "[object SafariRemoteNotification]"; })(!(/** @type {any} */ (top))['safari'] || (typeof (/** @type {any} */ (top)).safari !== 'undefined' && (/** @type {any} */ (top)).safari.pushNotification));
         },
 
         isMobileSafari: function() {
@@ -105,6 +105,9 @@ var Flot = (function (exports) {
             var keys = Object.keys(src);
             for (var k = 0; k < keys.length; k++) {
                 var key = keys[k];
+                if (key === '__proto__' || key === 'constructor') {
+                    continue;
+                }
                 var val = src[key];
                 if (val === undefined) {
                     continue;
@@ -171,10 +174,11 @@ var Flot = (function (exports) {
         }
     }
 
-    // Trigger a custom event on an element. Extra args are passed as the
-    // event's `detail` property (an array). For jQuery adapter compatibility,
-    // the adapter re-dispatches these as jQuery events so $(el).on() works.
-    function trigger(el, type, args) {
+    // Default trigger: dispatches a native CustomEvent with extra args stashed
+    // on `event.detail` (an array). The jQuery adapter overrides this via
+    // setTrigger so handlers bound with $(el).on(type, fn) receive the extra
+    // args as positional parameters, matching upstream flot/flot behavior.
+    var triggerImpl = function(el, type, args) {
         var event = new CustomEvent(type, {
             detail: args || [],
             bubbles: true,
@@ -182,6 +186,10 @@ var Flot = (function (exports) {
         });
         el.dispatchEvent(event);
         return event;
+    };
+
+    function trigger(el, type, args) {
+        return triggerImpl(el, type, args);
     }
 
     // Bind an event listener, tracking it so unbindAll can remove it later.
@@ -444,7 +452,9 @@ var Flot = (function (exports) {
                 layer.style.left = '0px';
                 layer.style.bottom = '0px';
                 layer.style.right = '0px';
-                svgElement.appendChild(layer);
+                if (svgElement) {
+                    svgElement.appendChild(layer);
+                }
                 this.SVG[classes] = layer;
             }
 
@@ -538,8 +548,8 @@ var Flot = (function (exports) {
 
                 element.style.position = 'absolute';
                 element.style.maxWidth = width;
-                element.setAttributeNS(null, 'x', -9999);
-                element.setAttributeNS(null, 'y', -9999);
+                element.setAttributeNS(null, 'x', String(-9999));
+                element.setAttributeNS(null, 'y', String(-9999));
 
                 if (typeof font === 'object') {
                     element.style.font = textStyle;
@@ -563,7 +573,9 @@ var Flot = (function (exports) {
                 while (element.firstChild) {
                     element.removeChild(element.firstChild);
                 }
-                element.parentNode.removeChild(element);
+                if (element.parentNode) {
+                    element.parentNode.removeChild(element);
+                }
             }
 
             info.measured = true;
@@ -719,10 +731,16 @@ var Flot = (function (exports) {
                             var styleCache = layerCache[styleKey];
                             for (var key in styleCache) {
                                 if (Object.prototype.hasOwnProperty.call(styleCache, key)) {
+                                    // styleCache entries can exist without a
+                                    // positions array (e.g. when a Flot plugin
+                                    // populates the cache outside the normal
+                                    // addText path). Upstream flot/flot#1444.
                                     var positions = styleCache[key].positions;
-                                    positions.forEach(function(position) {
-                                        position.active = false;
-                                    });
+                                    if (positions != null) {
+                                        positions.forEach(function(position) {
+                                            position.active = false;
+                                        });
+                                    }
                                 }
                             }
                         }
@@ -3361,8 +3379,11 @@ var Flot = (function (exports) {
                         };
 
                         // 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);
 
@@ -4269,7 +4290,13 @@ var Flot = (function (exports) {
                     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
@@ -4469,7 +4496,16 @@ var Flot = (function (exports) {
                 } 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) {
@@ -4497,7 +4533,7 @@ var Flot = (function (exports) {
         // Plugin registry. Plugins push to this array to register themselves.
         var plugins = [];
 
-        var version = "5.1.0";
+        var version = "5.1.2";
 
         // The main plot function.
         function plot(placeholder, data, options) {
@@ -5758,6 +5794,17 @@ var Flot = (function (exports) {
                     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;
@@ -5922,6 +5969,13 @@ var Flot = (function (exports) {
                     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;
@@ -5975,7 +6029,7 @@ var Flot = (function (exports) {
                     ctx.lineJoin = "round";
                     var startx = Math.round(panHint.start.x),
                         starty = Math.round(panHint.start.y),
-                        endx, endy;
+                        endx = 0, endy = 0;
 
                     if (panAxes) {
                         if (panAxes[0].direction === 'x') {
@@ -6740,13 +6794,14 @@ var Flot = (function (exports) {
         }
 
         function initTouchNavigation$1(plot, options) {
+            /** @type {{ zoomEnable: boolean, prevDistance: number | null, prevTapTime: number, prevPanPosition: {x: number, y: number}, prevTapPosition: {x: number, y: number} }} */
             var gestureState = {
                     zoomEnable: false,
                     prevDistance: null,
-                    prevTapTime: 0,
                     prevPanPosition: { x: 0, y: 0 },
                     prevTapPosition: { x: 0, y: 0 }
                 },
+                /** @type {{ prevTouchedAxis: string, currentTouchedAxis: string, touchedAxis: any, navigationConstraint: string, initialState: any }} */
                 navigationState = {
                     prevTouchedAxis: 'none',
                     currentTouchedAxis: 'none',
@@ -6803,7 +6858,7 @@ var Flot = (function (exports) {
                 drag: function(e) {
                     presetNavigationState(e, 'pan');
 
-                    if (useSmartPan) {
+                    if (useSmartPan && navigationState.initialState) {
                         var point = getPoint(e, 'pan');
                         plot.smartPan({
                             x: navigationState.initialState.startPageX - point.x,
@@ -6827,7 +6882,7 @@ var Flot = (function (exports) {
                     }
 
                     if (wasPinchEvent(e, gestureState)) {
-                        updateprevPanPosition(e, 'pan', gestureState, navigationState);
+                        updatePrevPanPosition(e, 'pan', gestureState, navigationState);
                     }
                 }
             };
@@ -6859,7 +6914,7 @@ var Flot = (function (exports) {
 
                         var dist = pinchDistance(e);
 
-                        if (gestureState.zoomEnable || Math.abs(dist - gestureState.prevDistance) > ZOOM_DISTANCE_MARGIN) {
+                        if (gestureState.zoomEnable || (gestureState.prevDistance != null && Math.abs(dist - gestureState.prevDistance) > ZOOM_DISTANCE_MARGIN)) {
                             zoomPlot(plot, e, gestureState, navigationState);
 
                             //activate zoom mode
@@ -7119,10 +7174,10 @@ var Flot = (function (exports) {
                     newEvent = new CustomEvent('mouseevent');
 
                 //transform from touch event to mouse event format
-                newEvent.pageX = e.detail.changedTouches[0].pageX;
-                newEvent.pageY = e.detail.changedTouches[0].pageY;
-                newEvent.clientX = e.detail.changedTouches[0].clientX;
-                newEvent.clientY = e.detail.changedTouches[0].clientY;
+                /** @type {any} */ (newEvent).pageX = e.detail.changedTouches[0].pageX;
+                /** @type {any} */ (newEvent).pageY = e.detail.changedTouches[0].pageY;
+                /** @type {any} */ (newEvent).clientX = e.detail.changedTouches[0].clientX;
+                /** @type {any} */ (newEvent).clientY = e.detail.changedTouches[0].clientY;
 
                 if (o.grid.hoverable) {
                     doTriggerClickHoverEvent(newEvent, eventType.hover, 30);
@@ -7401,6 +7456,7 @@ var Flot = (function (exports) {
         }
 
         function initTouchNavigation(plot, options) {
+            /** @type {{ twoTouches: boolean, currentTapStart: {x: number, y: number}, currentTapEnd: {x: number, y: number}, prevTap: {x: number, y: number}, currentTap: {x: number, y: number}, interceptedLongTap: boolean, isUnsupportedGesture: boolean, prevTapTime: number | null, tapStartTime: number | null, longTapTriggerId: ReturnType<typeof setTimeout> | null }} */
             var gestureState = {
                     twoTouches: false,
                     currentTapStart: { x: 0, y: 0 },
@@ -7554,6 +7610,7 @@ var Flot = (function (exports) {
                 },
 
                 isLongTap: function(e) {
+                    if (gestureState.tapStartTime == null) return false;
                     var currentTime = new Date().getTime(),
                         tapDuration = currentTime - gestureState.tapStartTime;
                     if (tapDuration >= minLongTapDuration && !gestureState.interceptedLongTap) {
@@ -7594,6 +7651,7 @@ var Flot = (function (exports) {
                 },
 
                 isTap: function(e) {
+                    if (gestureState.tapStartTime == null) return false;
                     var currentTime = new Date().getTime(),
                         tapDuration = currentTime - gestureState.tapStartTime;
                     if (tapDuration <= pressedTapDuration) {
@@ -7642,7 +7700,9 @@ var Flot = (function (exports) {
             }
             function isDoubleTap(e) {
                 var currentTime = new Date().getTime(),
-                    intervalBetweenTaps = currentTime - gestureState.prevTapTime;
+                    intervalBetweenTaps = gestureState.prevTapTime != null
+                        ? currentTime - gestureState.prevTapTime
+                        : Infinity;
 
                 if (intervalBetweenTaps >= 0 && intervalBetweenTaps < maxIntervalBetweenTaps) {
                     if (distance(gestureState.prevTap.x, gestureState.prevTap.y, gestureState.currentTap.x, gestureState.currentTap.y) < maxDistanceBetweenTaps) {
@@ -8029,9 +8089,9 @@ var Flot = (function (exports) {
             }
 
             for (var i = 0; i < spec.length - 1; ++i) {
-                if (axis.delta < (spec[i][0] * timeUnitSize[spec[i][1]] +
-                    spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2 &&
-                    spec[i][0] * timeUnitSize[spec[i][1]] >= minSize) {
+                if (axis.delta < (Number(spec[i][0]) * timeUnitSize[spec[i][1]] +
+                    Number(spec[i + 1][0]) * timeUnitSize[spec[i + 1][1]]) / 2 &&
+                    Number(spec[i][0]) * timeUnitSize[spec[i][1]] >= minSize) {
                     break;
                 }
             }
@@ -8694,6 +8754,7 @@ var Flot = (function (exports) {
             }
 
             function triggerSelectedEvent() {
+                /** @type {any} */
                 var r = getSelection();
 
                 trigger(plot.getPlaceholder(), "plotselected", [ r ]);
@@ -8776,7 +8837,7 @@ var Flot = (function (exports) {
 
             // function taken from markings support in Flot
             function extractRange(ranges, coord) {
-                var axis, from, to, key, axes = plot.getAxes();
+                var axis, from, to, /** @type {string|undefined} */ key, axes = plot.getAxes();
 
                 for (var k in axes) {
                     axis = axes[k];
@@ -8796,7 +8857,7 @@ var Flot = (function (exports) {
                 }
 
                 // backwards-compat stuff - to be removed in future
-                if (!ranges[key]) {
+                if (key && !ranges[key]) {
                     axis = coord === "x" ? plot.getXAxes()[0] : plot.getYAxes()[0];
                     from = ranges[coord + "1"];
                     to = ranges[coord + "2"];
@@ -9205,7 +9266,7 @@ var Flot = (function (exports) {
                 const utf8Array = new Uint8Array(arrayBuffer);
                 const blockSize = 16384;
                 for (var i = 0; i < utf8Array.length; i = i + blockSize) {
-                    const binarySubString = String.fromCharCode.apply(null, utf8Array.subarray(i, i + blockSize));
+                    const binarySubString = String.fromCharCode.apply(null, /** @type {any} */ (utf8Array.subarray(i, i + blockSize)));
                     binaryString = binaryString + binarySubString;
                 }
                 return binaryString;
@@ -9420,7 +9481,7 @@ var Flot = (function (exports) {
 
             var left = 0;
             var columnWidths = [];
-            var style = window.getComputedStyle(document.querySelector('body'));
+            var style = window.getComputedStyle(document.body);
             for (i = 0; i < entries.length; ++i) {
                 let columnIndex = i % options.legend.noColumns;
                 entry = entries[i];
@@ -9485,6 +9546,17 @@ var Flot = (function (exports) {
                     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>';
@@ -9524,9 +9596,17 @@ var Flot = (function (exports) {
                 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';
             }
         }
 
@@ -9620,6 +9700,14 @@ var Flot = (function (exports) {
                         '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" ' +
@@ -9642,6 +9730,12 @@ var Flot = (function (exports) {
                     '<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>' +