@kevinburke/flot 5.1.1 → 5.1.2

package/CHANGELOG.md

@@ -5,6 +5,30 @@ 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

package/dist/flot.js

@@ -1,4 +1,4 @@
-/*! @kevinburke/flot v5.1.1 | 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;
@@ -4521,7 +4533,7 @@ var Flot = (function (exports) {
         // Plugin registry. Plugins push to this array to register themselves.
         var plugins = [];
 
-        var version = "5.1.1";
+        var version = "5.1.2";
 
         // The main plot function.
         function plot(placeholder, data, options) {
@@ -6017,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') {
@@ -6782,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',
@@ -6845,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,
@@ -6869,7 +6882,7 @@ var Flot = (function (exports) {
                     }
 
                     if (wasPinchEvent(e, gestureState)) {
-                        updateprevPanPosition(e, 'pan', gestureState, navigationState);
+                        updatePrevPanPosition(e, 'pan', gestureState, navigationState);
                     }
                 }
             };
@@ -6901,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
@@ -7161,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);
@@ -7443,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 },
@@ -7596,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) {
@@ -7636,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) {
@@ -7684,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) {
@@ -8071,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;
                 }
             }
@@ -8736,6 +8754,7 @@ var Flot = (function (exports) {
             }
 
             function triggerSelectedEvent() {
+                /** @type {any} */
                 var r = getSelection();
 
                 trigger(plot.getPlaceholder(), "plotselected", [ r ]);
@@ -8818,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];
@@ -8838,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"];
@@ -9247,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;
@@ -9462,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];