@kevinburke/flot 5.1.1 → 5.1.2

package/dist/flot.mjs

@@ -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 browser = {
     getPageXY: function (e) {
         var doc = document.documentElement,
@@ -21,7 +21,7 @@ var browser = {
     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() {
@@ -102,6 +102,9 @@ function extend(deep, target) {
         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;
@@ -168,10 +171,11 @@ function removeData(el, key) {
     }
 }
 
-// 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,
@@ -179,6 +183,10 @@ function trigger(el, type, args) {
     });
     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.
@@ -441,7 +449,9 @@ var Canvas = function(cls, container) {
             layer.style.left = '0px';
             layer.style.bottom = '0px';
             layer.style.right = '0px';
-            svgElement.appendChild(layer);
+            if (svgElement) {
+                svgElement.appendChild(layer);
+            }
             this.SVG[classes] = layer;
         }
 
@@ -535,8 +545,8 @@ var Canvas = function(cls, container) {
 
             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;
@@ -560,7 +570,9 @@ var Canvas = function(cls, container) {
             while (element.firstChild) {
                 element.removeChild(element.firstChild);
             }
-            element.parentNode.removeChild(element);
+            if (element.parentNode) {
+                element.parentNode.removeChild(element);
+            }
         }
 
         info.measured = true;
@@ -4518,7 +4530,7 @@ Licensed under the MIT license.
     // 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) {
@@ -6014,7 +6026,7 @@ Licensed under the MIT license.
                 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') {
@@ -6779,13 +6791,14 @@ var options$4 = {
     }
 
     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',
@@ -6842,7 +6855,7 @@ var options$4 = {
             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,
@@ -6866,7 +6879,7 @@ var options$4 = {
                 }
 
                 if (wasPinchEvent(e, gestureState)) {
-                    updateprevPanPosition(e, 'pan', gestureState, navigationState);
+                    updatePrevPanPosition(e, 'pan', gestureState, navigationState);
                 }
             }
         };
@@ -6898,7 +6911,7 @@ var options$4 = {
 
                     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
@@ -7158,10 +7171,10 @@ var options$4 = {
                 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);
@@ -7440,6 +7453,7 @@ var options$2 = {
     }
 
     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 },
@@ -7593,6 +7607,7 @@ var options$2 = {
             },
 
             isLongTap: function(e) {
+                if (gestureState.tapStartTime == null) return false;
                 var currentTime = new Date().getTime(),
                     tapDuration = currentTime - gestureState.tapStartTime;
                 if (tapDuration >= minLongTapDuration && !gestureState.interceptedLongTap) {
@@ -7633,6 +7648,7 @@ var options$2 = {
             },
 
             isTap: function(e) {
+                if (gestureState.tapStartTime == null) return false;
                 var currentTime = new Date().getTime(),
                     tapDuration = currentTime - gestureState.tapStartTime;
                 if (tapDuration <= pressedTapDuration) {
@@ -7681,7 +7697,9 @@ var options$2 = {
         }
         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) {
@@ -8068,9 +8086,9 @@ API.txt for details.
         }
 
         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;
             }
         }
@@ -8733,6 +8751,7 @@ The plugin allso adds the following methods to the plot object:
         }
 
         function triggerSelectedEvent() {
+            /** @type {any} */
             var r = getSelection();
 
             trigger(plot.getPlaceholder(), "plotselected", [ r ]);
@@ -8815,7 +8834,7 @@ The plugin allso adds the following methods to the plot object:
 
         // 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];
@@ -8835,7 +8854,7 @@ The plugin allso adds the following methods to the plot object:
             }
 
             // 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"];
@@ -9244,7 +9263,7 @@ temporary images load their data.
             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;
@@ -9459,7 +9478,7 @@ temporary images load their data.
 
         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];

package/dist/jquery.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 */
 (function ($) {
     'use strict';
 
@@ -24,7 +24,7 @@
         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 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 @@
         }
     }
 
-    // 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,14 @@
         });
         el.dispatchEvent(event);
         return event;
+    };
+
+    function trigger(el, type, args) {
+        return triggerImpl(el, type, args);
+    }
+
+    function setTrigger(fn) {
+        triggerImpl = fn;
     }
 
     // Bind an event listener, tracking it so unbindAll can remove it later.
@@ -444,7 +456,9 @@
                 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 +552,8 @@
 
                 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 +577,9 @@
                 while (element.firstChild) {
                     element.removeChild(element.firstChild);
                 }
-                element.parentNode.removeChild(element);
+                if (element.parentNode) {
+                    element.parentNode.removeChild(element);
+                }
             }
 
             info.measured = true;
@@ -4521,7 +4537,7 @@
         // 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 +6033,7 @@
                     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 +6798,14 @@
         }
 
         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 +6862,7 @@
                 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 +6886,7 @@
                     }
 
                     if (wasPinchEvent(e, gestureState)) {
-                        updateprevPanPosition(e, 'pan', gestureState, navigationState);
+                        updatePrevPanPosition(e, 'pan', gestureState, navigationState);
                     }
                 }
             };
@@ -6901,7 +6918,7 @@
 
                         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 +7178,10 @@
                     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 +7460,7 @@
         }
 
         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 +7614,7 @@
                 },
 
                 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 +7655,7 @@
                 },
 
                 isTap: function(e) {
+                    if (gestureState.tapStartTime == null) return false;
                     var currentTime = new Date().getTime(),
                         tapDuration = currentTime - gestureState.tapStartTime;
                     if (tapDuration <= pressedTapDuration) {
@@ -7684,7 +7704,9 @@
             }
             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 +8093,9 @@
             }
 
             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 +8758,7 @@
             }
 
             function triggerSelectedEvent() {
+                /** @type {any} */
                 var r = getSelection();
 
                 trigger(plot.getPlaceholder(), "plotselected", [ r ]);
@@ -8818,7 +8841,7 @@
 
             // 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 +8861,7 @@
                 }
 
                 // 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 +9270,7 @@
                 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 +9485,7 @@
 
             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];
@@ -9899,6 +9922,24 @@
     //   $.plot("#placeholder", data, options);
 
 
+    // Route flot's internal trigger() through jQuery so plugin handlers bound
+    // via $(el).on(type, fn) see the same data shape as upstream flot/flot.
+    // Two conventions coexist in the plugins, matching upstream:
+    //   - trigger(el, type, [arg0, arg1, ...])  →  $(el).trigger(type, [args])
+    //     jQuery spreads the array into handler positional params, so
+    //     function(event, pos, item, items) works (plothover, plotzoom, ...).
+    //   - trigger(el, type, <non-array>)        →  $.Event(type, { detail: x })
+    //     Handlers read event.detail, matching upstream's re-center contract
+    //     where a plain object (or Event) is attached to event.detail.
+    setTrigger(function(el, type, args) {
+        if (args === undefined || Array.isArray(args)) {
+            $(el).trigger(type, args || []);
+            return;
+        }
+        var event = $.Event(type, { detail: args });
+        $(el).trigger(event);
+    });
+
     // Register $.plot and $.color on the jQuery object.
     $.plot = function(placeholder, data, options) {
         var el = typeof placeholder === 'string'