chartkick 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d951f0a4aa01b326035d2d0450b52ecdab42394db007f491961da275e07ed3b
-  data.tar.gz: b00f3adb59f0dea93aebcdbaa7e46c5489dfc3880ee173a7fb092378fd380f0a
+  metadata.gz: d37a995b1d870a7e93be5d5eb338d163e1b42653304baab7bad889aff6f655fe
+  data.tar.gz: 9c5495a74d4e6c03b199a263556d9dcee91ee4e0c87fb7694851971068a817e2
 SHA512:
-  metadata.gz: 1ac7c061e06073552822ba3109b85551e7a3461e9eb605af414da45b57b134842ff328832a8610038a5a4dd6d6180e2d50a21083d35374bd6da3664c69a485e5
-  data.tar.gz: bdc7c87d2cc57f534c4f2d200e0b8bcaec5e891e4d778461079e1129f6df53b5df283685a0934ec4e87e8e71154c19a3b8fea052fb0152ffdd91ec064f050b07
+  metadata.gz: e2e350cf8f342a7d55bfbc0a6581c92e25b4a59442719ef12aa32400ba9610b137360a10535a96afa049025a739235f28b00ade4299ad1cad5d2f9525ea1517d
+  data.tar.gz: 3de86761cb1f9e63d71589640827cc8391c668b398f9e49cdf4f4029351850181cc4e8197d8c6c341b6e7d79147ee01d96be6cf72b55ccca1f1395f4504d951e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.5
+
+- Updated Chartkick.js to 2.3.6
+
 ## 2.3.4
 
 - Updated Chartkick.js to 2.3.5

data/README.md

@@ -226,6 +226,14 @@ You can pass options directly to the charting library with:
 
 See the documentation for [Chart.js](https://www.chartjs.org/docs/), [Google Charts](https://developers.google.com/chart/interactive/docs/gallery), and [Highcharts](https://api.highcharts.com/highcharts) for more info.
 
+To customize datasets in Chart.js, use:
+
+```erb
+<%= line_chart data, dataset: {borderWidth: 10} %>
+```
+
+You can pass this option to individual series as well.
+
 ### Global Options
 
 To set options for all of your charts, create an initializer `config/initializers/chartkick.rb` with:

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "2.3.4"
+  VERSION = "2.3.5"
 end

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
- * v2.3.5
+ * v2.3.6
  * MIT License
  */
 
@@ -532,6 +532,7 @@
         borderColor: color,
         backgroundColor: backgroundColor,
         pointBackgroundColor: color,
+        pointHoverBackgroundColor: color,
         borderWidth: 2
       };
 
@@ -548,7 +549,11 @@
         dataset.pointHitRadius = 5;
       }
 
-      datasets.push(merge(dataset, s.library || {}));
+      dataset = merge(dataset, chart.options.dataset || {});
+      dataset = merge(dataset, s.library || {});
+      dataset = merge(dataset, s.dataset || {});
+
+      datasets.push(dataset);
     }
 
     if (detectType && labels.length > 0) {
@@ -666,14 +671,15 @@
       values.push(point[1]);
     }
 
+    var dataset = {
+      data: values,
+      backgroundColor: chart.options.colors || defaultColors
+    };
+    dataset = merge(dataset, chart.options.dataset || {});
+
     var data = {
       labels: labels,
-      datasets: [
-        {
-          data: values,
-          backgroundColor: chart.options.colors || defaultColors
-        }
-      ]
+      datasets: [dataset]
     };
 
     this.drawChart(chart, "pie", data, options);
@@ -758,10 +764,14 @@
     this.renderScatterChart(chart, "bubble");
   };
 
-  defaultExport.prototype.drawChart = function drawChart (chart, type, data, options) {
+  defaultExport.prototype.destroy = function destroy (chart) {
     if (chart.chart) {
       chart.chart.destroy();
     }
+  };
+
+  defaultExport.prototype.drawChart = function drawChart (chart, type, data, options) {
+    this.destroy(chart);
 
     chart.element.innerHTML = "<canvas></canvas>";
     var ctx = chart.element.getElementsByTagName("CANVAS")[0];
@@ -1030,10 +1040,14 @@
     this.renderLineChart(chart, "areaspline");
   };
 
-  defaultExport$1.prototype.drawChart = function drawChart (chart, data, options) {
+  defaultExport$1.prototype.destroy = function destroy (chart) {
     if (chart.chart) {
       chart.chart.destroy();
     }
+  };
+
+  defaultExport$1.prototype.drawChart = function drawChart (chart, data, options) {
+    this.destroy(chart);
 
     options.chart.renderTo = chart.element.id;
     options.series = data;
@@ -1337,10 +1351,14 @@
     });
   };
 
-  defaultExport$2.prototype.drawChart = function drawChart (chart, type, data, options) {
+  defaultExport$2.prototype.destroy = function destroy (chart) {
     if (chart.chart) {
       chart.chart.clearChart();
     }
+  };
+
+  defaultExport$2.prototype.drawChart = function drawChart (chart, type, data, options) {
+    this.destroy(chart);
 
     chart.chart = new type(chart.element);
     resize(function () {
@@ -1574,20 +1592,20 @@
     link.appendChild(image);
     element.style.position = "relative";
 
-    chart.downloadAttached = true;
+    chart.__downloadAttached = true;
 
     // mouseenter
-    addEvent(element, "mouseover", function(e) {
+    chart.__enterEvent = addEvent(element, "mouseover", function(e) {
       var related = e.relatedTarget;
       // check download option again to ensure it wasn't changed
-      if (!related || (related !== this && !childOf(this, related)) && chart.options.download) {
+      if ((!related || (related !== this && !childOf(this, related))) && chart.options.download) {
         link.href = chart.toImage();
         element.appendChild(link);
       }
     });
 
     // mouseleave
-    addEvent(element, "mouseout", function(e) {
+    chart.__leaveEvent = addEvent(element, "mouseout", function(e) {
       var related = e.relatedTarget;
       if (!related || (related !== this && !childOf(this, related))) {
         if (link.parentNode) {
@@ -1601,11 +1619,22 @@
   function addEvent(elem, event, fn) {
     if (elem.addEventListener) {
       elem.addEventListener(event, fn, false);
+      return fn;
     } else {
-      elem.attachEvent("on" + event, function() {
+      var fn2 = function() {
         // set the this pointer same as addEventListener when fn is called
         return(fn.call(elem, window.event));
-      });
+      };
+      elem.attachEvent("on" + event, fn2);
+      return fn2;
+    }
+  }
+
+  function removeEvent(elem, event, fn) {
+    if (elem.removeEventListener) {
+      elem.removeEventListener(event, fn, false);
+    } else {
+      elem.detachEvent("on" + event, fn);
     }
   }
 
@@ -1670,7 +1699,7 @@
       setText(chart.element, chart.options.messages.empty);
     } else {
       callAdapter(chartType, chart);
-      if (chart.options.download && !chart.downloadAttached && chart.adapter === "chartjs") {
+      if (chart.options.download && !chart.__downloadAttached && chart.adapter === "chartjs") {
         addDownloadButton(chart);
       }
     }
@@ -1689,6 +1718,7 @@
       adapter = adapters[i];
       if ((!adapterName || adapterName === adapter.name) && isFunction(adapter[fnName])) {
         chart.adapter = adapter.name;
+        chart.__adapterObject = adapter;
         return adapter[fnName](chart);
       }
     }
@@ -1907,6 +1937,20 @@
     }
   };
 
+  Chart.prototype.destroy = function destroy () {
+    if (this.__adapterObject) {
+      this.__adapterObject.destroy(this);
+    }
+
+    if (this.__enterEvent) {
+      removeEvent(this.element, "mouseover", this.__enterEvent);
+    }
+
+    if (this.__leaveEvent) {
+      removeEvent(this.element, "mouseout", this.__leaveEvent);
+    }
+  };
+
   Chart.prototype.__updateOptions = function __updateOptions (options) {
     var updateRefresh = options.refresh && options.refresh !== this.options.refresh;
     this.options = merge(Chartkick.options, options);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler