@kevinburke/flot 5.1.1 → 5.1.3

package/source/jquery-adapter.js

@@ -35,14 +35,34 @@ import {
     dateTickGenerator,
     composeImages,
 } from './index.js';
+import * as helpers from './helpers.js';
+var setTrigger = helpers.setTrigger;
+
+// 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) {
+$.plot = /** @type {typeof $.plot} */ (function(placeholder, data, options) {
     var el = typeof placeholder === 'string'
         ? document.querySelector(placeholder)
         : (placeholder instanceof $ ? placeholder[0] : placeholder);
     return plot(el, data, options);
-};
+});
 
 $.plot.plugins = plugins;
 $.plot.version = version;
@@ -80,4 +100,9 @@ if (typeof window !== 'undefined') {
         window.Flot = {};
     }
     window.Flot.Canvas = Canvas;
+    // Exposed so standalone plugin bundles (dist/plugins/*.js) can resolve
+    // their `import { plugins } from './jquery.flot.js'` and
+    // `import { ... } from './helpers.js'` to live objects on this global.
+    window.Flot.plugins = plugins;
+    window.Flot.helpers = helpers;
 }

package/source/jquery.canvaswrapper.js

@@ -221,7 +221,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;
         }
 
@@ -315,8 +317,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;
@@ -340,7 +342,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;

package/source/jquery.flot.browser.js

@@ -22,7 +22,7 @@ export 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() {

package/source/jquery.flot.composeImages.js

@@ -165,7 +165,7 @@ import { browser } from './jquery.flot.browser.js';
             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;

package/source/jquery.flot.hover.js

@@ -80,10 +80,10 @@ import { bind, unbind, trigger } from './helpers.js';
                 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);

package/source/jquery.flot.image.js

@@ -52,6 +52,7 @@ Google Maps).
 
 */
 
+import $ from 'jquery';
 import { plugins } from './jquery.flot.js';
 
     var options = {
@@ -64,7 +65,7 @@ import { plugins } from './jquery.flot.js';
         }
     };
 
-    export var image = {};
+    var image = {};
 
     image.loadDataImages = function (series, options, callback) {
         var urls = [], points = [];
@@ -250,3 +251,7 @@ import { plugins } from './jquery.flot.js';
         name: 'image',
         version: '1.1'
     });
+
+    // Expose the image helpers as $.plot.image so example code can call
+    // $.plot.image.loadDataImages(...) / $.plot.image.load(...).
+    $.plot.image = image;

package/source/jquery.flot.js

@@ -2822,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.1.1";
+    export var version = "5.1.3";
 
     // The main plot function.
     export function plot(placeholder, data, options) {

package/source/jquery.flot.legend.js

@@ -54,7 +54,7 @@ import { plugins } from './jquery.flot.js';
 
         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/source/jquery.flot.navigate.js

@@ -790,7 +790,7 @@ import { bind, unbind, trigger, css } from './helpers.js';
                 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') {

package/source/jquery.flot.pie.js

@@ -660,8 +660,8 @@ import { extend, bind, unbind, trigger, width, height } from './helpers.js';
             // 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);
+            var canvasX = parseInt(String(e.pageX - offset.left));
+            var canvasY = parseInt(String(e.pageY - offset.top));
             var item = findNearbySlice(canvasX, canvasY);
 
             if (options.grid.autoHighlight) {

package/source/jquery.flot.selection.js

@@ -203,6 +203,7 @@ import { bind, trigger, unbind } from './helpers.js';
         }
 
         function triggerSelectedEvent() {
+            /** @type {any} */
             var r = getSelection();
 
             trigger(plot.getPlaceholder(), "plotselected", [ r ]);
@@ -285,7 +286,7 @@ import { bind, trigger, unbind } from './helpers.js';
 
         // 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];
@@ -305,7 +306,7 @@ import { bind, trigger, unbind } from './helpers.js';
             }
 
             // 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"];

package/source/jquery.flot.time.js

@@ -329,9 +329,9 @@ import { saturated } from './jquery.flot.saturated.js';
         }
 
         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;
             }
         }

package/source/jquery.flot.touch.js

@@ -14,6 +14,7 @@ import { plugins } from './jquery.flot.js';
     }
 
     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 },
@@ -167,6 +168,7 @@ import { plugins } from './jquery.flot.js';
             },
 
             isLongTap: function(e) {
+                if (gestureState.tapStartTime == null) return false;
                 var currentTime = new Date().getTime(),
                     tapDuration = currentTime - gestureState.tapStartTime;
                 if (tapDuration >= minLongTapDuration && !gestureState.interceptedLongTap) {
@@ -207,6 +209,7 @@ import { plugins } from './jquery.flot.js';
             },
 
             isTap: function(e) {
+                if (gestureState.tapStartTime == null) return false;
                 var currentTime = new Date().getTime(),
                     tapDuration = currentTime - gestureState.tapStartTime;
                 if (tapDuration <= pressedTapDuration) {
@@ -259,7 +262,9 @@ import { plugins } from './jquery.flot.js';
 
         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) {

package/source/jquery.flot.touchNavigate.js

@@ -24,6 +24,7 @@ import { trigger } from './helpers.js';
     }
 
     function initTouchNavigation(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,
@@ -31,6 +32,7 @@ import { trigger } from './helpers.js';
                 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',
@@ -87,7 +89,7 @@ import { trigger } from './helpers.js';
             drag: function(e) {
                 presetNavigationState(e, 'pan', gestureState);
 
-                if (useSmartPan) {
+                if (useSmartPan && navigationState.initialState) {
                     var point = getPoint(e, 'pan');
                     plot.smartPan({
                         x: navigationState.initialState.startPageX - point.x,
@@ -111,7 +113,7 @@ import { trigger } from './helpers.js';
                 }
 
                 if (wasPinchEvent(e, gestureState)) {
-                    updateprevPanPosition(e, 'pan', gestureState, navigationState);
+                    updatePrevPanPosition(e, 'pan', gestureState, navigationState);
                 }
             }
         };
@@ -143,7 +145,7 @@ import { trigger } from './helpers.js';
 
                     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

package/types/jquery.d.ts

@@ -23,11 +23,12 @@ declare global {
 			dateGenerator: unknown;
 			dateTickGenerator: unknown;
 			composeImages: unknown;
+			image?: unknown;
 		};
 		color: {
 			make(r: number, g: number, b: number, a?: number): unknown;
 			parse(str: string): unknown;
-			extract(elem: JQuery, cssProp: string): unknown;
+			extract(elem: HTMLElement | JQuery, cssProp: string): unknown;
 		};
 	}