Merge pull request #82 from Makanz/bugfix/scale-type-time

Bugfix/scale type time
Makanz · Sep 13, 2023 · b72fb07 · b72fb07
2 parents 20437e5 + de7e564
commit b72fb07
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 71 deletions.
diff --git a/dist/chartjs-plugin-trendline.min.js b/dist/chartjs-plugin-trendline.min.js
diff --git a/dist/chartjs-plugin-trendline.min.js.LICENSE.txt b/dist/chartjs-plugin-trendline.min.js.LICENSE.txt
@@ -1,6 +1,6 @@
 /*!
  * chartjs-plugin-trendline.js
- * Version: 2.0.3
+ * Version: 2.0.4
  *
  * Copyright 2023 Marcus Alsterfjord
  * Released under the MIT license

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chartjs-plugin-trendline",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Trendline for Chart.js",
   "main": "src/chartjs-plugin-trendline.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/Makanz/chartjs-plugin-trendline#readme",
   "devDependencies": {
-    "webpack": "^5.83.1",
-    "webpack-cli": "^5.1.1"
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4"
   }
 }
diff --git a/src/chartjs-plugin-trendline.js b/src/chartjs-plugin-trendline.js
@@ -1,6 +1,6 @@
 /*!
  * chartjs-plugin-trendline.js
- * Version: 2.0.3
+ * Version: 2.0.4
  *
  * Copyright 2023 Marcus Alsterfjord
  * Released under the MIT license
@@ -69,7 +69,11 @@ function addFitter(datasetMeta, ctx, dataset, xScale, yScale) {
 
         if (['time', 'timeseries'].includes(xScale.options.type)) {
             var x = data.x != null ? data.x : data.t;
-            fitter.add(new Date(x).getTime(), data.y);
+            if (x !== undefined) {
+                fitter.add(new Date(x).getTime(), data.y);
+            } else {
+                fitter.add(index, data);
+            }
         } else if (xy) {
             if (!isNaN(data.x) && !isNaN(data.y)) {
                 fitter.add(data.x, data.y);