chartkick 4.0.4 → 4.1.2

data/vendor/assets/javascripts/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful charts with one line of JavaScript
  * https://github.com/ankane/chartkick.js
- * v4.0.4
+ * v4.1.1
  * MIT License
  */
 
@@ -748,17 +748,17 @@
 
     if (chart.xtype === "datetime") {
       if (notnull(xmin)) {
-        options.scales.x.ticks.min = toDate(xmin).getTime();
+        options.scales.x.min = toDate(xmin).getTime();
       }
       if (notnull(xmax)) {
-        options.scales.x.ticks.max = toDate(xmax).getTime();
+        options.scales.x.max = toDate(xmax).getTime();
       }
     } else if (chart.xtype === "number") {
       if (notnull(xmin)) {
-        options.scales.x.ticks.min = xmin;
+        options.scales.x.min = xmin;
       }
       if (notnull(xmax)) {
-        options.scales.x.ticks.max = xmax;
+        options.scales.x.max = xmax;
       }
     }
 
@@ -865,8 +865,8 @@
     var data = createDataTable(chart, options, chartType || "line");
 
     if (chart.xtype === "number") {
-      options.scales.x.type = "linear";
-      options.scales.x.position = "bottom";
+      options.scales.x.type = options.scales.x.type || "linear";
+      options.scales.x.position = options.scales.x.position ||"bottom";
     } else {
       options.scales.x.type = chart.xtype === "string" ? "category" : "time";
     }
@@ -956,8 +956,8 @@
 
     var data = createDataTable(chart, options, chartType);
 
-    options.scales.x.type = "linear";
-    options.scales.x.position = "bottom";
+    options.scales.x.type = options.scales.x.type || "linear";
+    options.scales.x.position = options.scales.x.position || "bottom";
 
     // prevent grouping hover and tooltips
     if (!("mode" in options.interaction)) {
@@ -1107,7 +1107,7 @@
       };
     }
 
-    if (!options.tooltip.pointFormatter) {
+    if (!options.tooltip.pointFormatter && !options.tooltip.pointFormat) {
       options.tooltip.pointFormatter = function () {
         return '<span style="color:' + this.color + '">\u25CF</span> ' + formatValue(this.series.name + ': <b>', this.y, formatOptions) + '</b><br/>';
       };
@@ -1149,7 +1149,11 @@
     }
 
     var options = jsOptions$1(chart, chart.options, chartOptions), data, i, j;
-    options.xAxis.type = chart.xtype === "string" ? "category" : (chart.xtype === "number" ? "linear" : "datetime");
+    if (chart.xtype === "number") {
+      options.xAxis.type = options.xAxis.type || "linear";
+    } else {
+      options.xAxis.type = chart.xtype === "string" ? "category" : "datetime";
+    }
     if (!options.chart.type) {
       options.chart.type = chartType;
     }
@@ -2491,6 +2495,9 @@
     document.addEventListener("turbolinks:before-render", function() {
       Chartkick.destroyAll();
     });
+    document.addEventListener("turbo:before-render", function() {
+      Chartkick.destroyAll();
+    });
 
     // use setTimeout so charting library can come later in same JS file
     setTimeout(function() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Create beautiful JavaScript charts with one line of Ruby