chartkick 4.0.2 → 4.0.3

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.2
+ * v4.0.3
  * MIT License
  */
 
@@ -560,6 +560,11 @@
       } else {
         var valueLabel = chartType === "bar" ? "x" : "y";
         options.plugins.tooltip.callbacks.label = function (context) {
+          // don't show null values for stacked charts
+          if (context.parsed[valueLabel] === null) {
+            return;
+          }
+
           var label = context.dataset.label || '';
           if (label) {
             label += ': ';
@@ -681,7 +686,7 @@
       s = series[i];
 
       // use colors for each bar for single series format
-      if (chart.options.colors && chart.singleSeriesFormat && (chartType === "bar" || chartType === "column") && !s.color) {
+      if (chart.options.colors && chart.singleSeriesFormat && (chartType === "bar" || chartType === "column") && !s.color && isArray(chart.options.colors) && !isArray(chart.options.colors[0])) {
         color = colors;
         backgroundColor = [];
         for (var j$3 = 0; j$3 < colors.length; j$3++) {
@@ -1687,6 +1692,202 @@
     return data;
   };
 
+  function formatSeriesData(data, keyType) {
+    var r = [], j, keyFunc;
+
+    if (keyType === "number") {
+      keyFunc = toFloat;
+    } else if (keyType === "datetime") {
+      keyFunc = toDate;
+    } else {
+      keyFunc = toStr;
+    }
+
+    if (keyType === "bubble") {
+      for (j = 0; j < data.length; j++) {
+        r.push([toFloat(data[j][0]), toFloat(data[j][1]), toFloat(data[j][2])]);
+      }
+    } else {
+      for (j = 0; j < data.length; j++) {
+        r.push([keyFunc(data[j][0]), toFloat(data[j][1])]);
+      }
+    }
+
+    if (keyType === "datetime") {
+      r.sort(sortByTime);
+    } else if (keyType === "number") {
+      r.sort(sortByNumberSeries);
+    }
+
+    return r;
+  }
+  function detectXType(series, noDatetime, options) {
+    if (dataEmpty(series)) {
+      if ((options.xmin || options.xmax) && (!options.xmin || isDate(options.xmin)) && (!options.xmax || isDate(options.xmax))) {
+        return "datetime";
+      } else {
+        return "number";
+      }
+    } else if (detectXTypeWithFunction(series, isNumber)) {
+      return "number";
+    } else if (!noDatetime && detectXTypeWithFunction(series, isDate)) {
+      return "datetime";
+    } else {
+      return "string";
+    }
+  }
+
+  function detectXTypeWithFunction(series, func) {
+    var i, j, data;
+    for (i = 0; i < series.length; i++) {
+      data = toArr(series[i].data);
+      for (j = 0; j < data.length; j++) {
+        if (!func(data[j][0])) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  // creates a shallow copy of each element of the array
+  // elements are expected to be objects
+  function copySeries(series) {
+    var newSeries = [], i, j;
+    for (i = 0; i < series.length; i++) {
+      var copy = {};
+      for (j in series[i]) {
+        if (series[i].hasOwnProperty(j)) {
+          copy[j] = series[i][j];
+        }
+      }
+      newSeries.push(copy);
+    }
+    return newSeries;
+  }
+
+  function processSeries(chart, keyType, noDatetime) {
+    var i;
+
+    var opts = chart.options;
+    var series = chart.rawData;
+
+    // see if one series or multiple
+    chart.singleSeriesFormat = (!isArray(series) || typeof series[0] !== "object" || isArray(series[0]));
+    if (chart.singleSeriesFormat) {
+      series = [{name: opts.label, data: series}];
+    }
+
+    // convert to array
+    // must come before dataEmpty check
+    series = copySeries(series);
+    for (i = 0; i < series.length; i++) {
+      series[i].data = toArr(series[i].data);
+    }
+
+    chart.xtype = keyType ? keyType : (opts.discrete ? "string" : detectXType(series, noDatetime, opts));
+
+    // right format
+    for (i = 0; i < series.length; i++) {
+      series[i].data = formatSeriesData(series[i].data, chart.xtype);
+    }
+
+    return series;
+  }
+
+  function processSimple(chart) {
+    var perfectData = toArr(chart.rawData), i;
+    for (i = 0; i < perfectData.length; i++) {
+      perfectData[i] = [toStr(perfectData[i][0]), toFloat(perfectData[i][1])];
+    }
+    return perfectData;
+  }
+
+  function dataEmpty(data, chartType) {
+    if (chartType === "PieChart" || chartType === "GeoChart" || chartType === "Timeline") {
+      return data.length === 0;
+    } else {
+      for (var i = 0; i < data.length; i++) {
+        if (data[i].data.length > 0) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+
+  function addDownloadButton(chart) {
+    var element = chart.element;
+    var link = document.createElement("a");
+
+    var download = chart.options.download;
+    if (download === true) {
+      download = {};
+    } else if (typeof download === "string") {
+      download = {filename: download};
+    }
+    link.download = download.filename || "chart.png"; // https://caniuse.com/download
+
+    link.style.position = "absolute";
+    link.style.top = "20px";
+    link.style.right = "20px";
+    link.style.zIndex = 1000;
+    link.style.lineHeight = "20px";
+    link.target = "_blank"; // for safari
+    var image = document.createElement("img");
+    image.alt = "Download";
+    image.style.border = "none";
+    // icon from font-awesome
+    // http://fa2png.io/
+    image.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAABCFBMVEUAAADMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMywEsqxAAAAV3RSTlMAAQIDBggJCgsMDQ4PERQaHB0eISIjJCouLzE0OTo/QUJHSUpLTU5PUllhYmltcHh5foWLjI+SlaCio6atr7S1t7m6vsHHyM7R2tze5Obo7fHz9ff5+/1hlxK2AAAA30lEQVQYGUXBhVYCQQBA0TdYWAt2d3d3YWAHyur7/z9xgD16Lw0DW+XKx+1GgX+FRzM3HWQWrHl5N/oapW5RPe0PkBu+UYeICvozTWZVK23Ao04B79oJrOsJDOoxkZoQPWgX29pHpCZEk7rEvQYiNSFq1UMqvlCjJkRBS1R8hb00Vb/TajtBL7nTHE1X1vyMQF732dQhyF2o6SAwrzP06iUQzvwsArlnzcOdrgBhJyHa1QOgO9U1GsKuvjUTjavliZYQ8nNPapG6sap/3nrIdJ6bOWzmX/fy0XVpfzZP3S8OJT3g9EEiJwAAAABJRU5ErkJggg==";
+    link.appendChild(image);
+    element.style.position = "relative";
+
+    chart.__downloadAttached = true;
+
+    // mouseenter
+    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) {
+        link.href = chart.toImage(download);
+        element.appendChild(link);
+      }
+    });
+
+    // mouseleave
+    chart.__leaveEvent = addEvent(element, "mouseout", function(e) {
+      var related = e.relatedTarget;
+      if (!related || (related !== this && !childOf(this, related))) {
+        if (link.parentNode) {
+          link.parentNode.removeChild(link);
+        }
+      }
+    });
+  }
+
+  // https://stackoverflow.com/questions/10149963/adding-event-listener-cross-browser
+  function addEvent(elem, event, fn) {
+    if (elem.addEventListener) {
+      elem.addEventListener(event, fn, false);
+      return fn;
+    } else {
+      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;
+    }
+  }
+
+  // https://gist.github.com/shawnbot/4166283
+  function childOf(p, c) {
+    if (p === c) { return false; }
+    while (c && c !== p) { c = c.parentNode; }
+    return c === p;
+  }
+
   var pendingRequests = [], runningRequests = 0, maxRequests = 4;
 
   function pushRequest(url, success, error) {
@@ -1805,86 +2006,6 @@
     }
   }
 
-  function addDownloadButton(chart) {
-    var element = chart.element;
-    var link = document.createElement("a");
-
-    var download = chart.options.download;
-    if (download === true) {
-      download = {};
-    } else if (typeof download === "string") {
-      download = {filename: download};
-    }
-    link.download = download.filename || "chart.png"; // https://caniuse.com/download
-
-    link.style.position = "absolute";
-    link.style.top = "20px";
-    link.style.right = "20px";
-    link.style.zIndex = 1000;
-    link.style.lineHeight = "20px";
-    link.target = "_blank"; // for safari
-    var image = document.createElement("img");
-    image.alt = "Download";
-    image.style.border = "none";
-    // icon from font-awesome
-    // http://fa2png.io/
-    image.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAABCFBMVEUAAADMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMywEsqxAAAAV3RSTlMAAQIDBggJCgsMDQ4PERQaHB0eISIjJCouLzE0OTo/QUJHSUpLTU5PUllhYmltcHh5foWLjI+SlaCio6atr7S1t7m6vsHHyM7R2tze5Obo7fHz9ff5+/1hlxK2AAAA30lEQVQYGUXBhVYCQQBA0TdYWAt2d3d3YWAHyur7/z9xgD16Lw0DW+XKx+1GgX+FRzM3HWQWrHl5N/oapW5RPe0PkBu+UYeICvozTWZVK23Ao04B79oJrOsJDOoxkZoQPWgX29pHpCZEk7rEvQYiNSFq1UMqvlCjJkRBS1R8hb00Vb/TajtBL7nTHE1X1vyMQF732dQhyF2o6SAwrzP06iUQzvwsArlnzcOdrgBhJyHa1QOgO9U1GsKuvjUTjavliZYQ8nNPapG6sap/3nrIdJ6bOWzmX/fy0XVpfzZP3S8OJT3g9EEiJwAAAABJRU5ErkJggg==";
-    link.appendChild(image);
-    element.style.position = "relative";
-
-    chart.__downloadAttached = true;
-
-    // mouseenter
-    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) {
-        link.href = chart.toImage(download);
-        element.appendChild(link);
-      }
-    });
-
-    // mouseleave
-    chart.__leaveEvent = addEvent(element, "mouseout", function(e) {
-      var related = e.relatedTarget;
-      if (!related || (related !== this && !childOf(this, related))) {
-        if (link.parentNode) {
-          link.parentNode.removeChild(link);
-        }
-      }
-    });
-  }
-
-  // https://stackoverflow.com/questions/10149963/adding-event-listener-cross-browser
-  function addEvent(elem, event, fn) {
-    if (elem.addEventListener) {
-      elem.addEventListener(event, fn, false);
-      return fn;
-    } else {
-      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);
-    }
-  }
-
-  // https://gist.github.com/shawnbot/4166283
-  function childOf(p, c) {
-    if (p === c) { return false; }
-    while (c && c !== p) { c = c.parentNode; }
-    return c === p;
-  }
-
   function getAdapterType(library) {
     if (library) {
       if (library.product === "Highcharts") {
@@ -1921,19 +2042,6 @@
     }
   }
 
-  function dataEmpty(data, chartType) {
-    if (chartType === "PieChart" || chartType === "GeoChart" || chartType === "Timeline") {
-      return data.length === 0;
-    } else {
-      for (var i = 0; i < data.length; i++) {
-        if (data[i].data.length > 0) {
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-
   function renderChart(chartType, chart) {
     if (dataEmpty(chart.data, chartType)) {
       var message = chart.options.empty || (chart.options.messages && chart.options.messages.empty) || "No data";
@@ -1971,121 +2079,6 @@
     }
   }
 
-  // process data
-
-  var toFormattedKey = function (key, keyType) {
-    if (keyType === "number") {
-      key = toFloat(key);
-    } else if (keyType === "datetime") {
-      key = toDate(key);
-    } else {
-      key = toStr(key);
-    }
-    return key;
-  };
-
-  var formatSeriesData = function (data, keyType) {
-    var r = [], key, j;
-    for (j = 0; j < data.length; j++) {
-      if (keyType === "bubble") {
-        r.push([toFloat(data[j][0]), toFloat(data[j][1]), toFloat(data[j][2])]);
-      } else {
-        key = toFormattedKey(data[j][0], keyType);
-        r.push([key, toFloat(data[j][1])]);
-      }
-    }
-    if (keyType === "datetime") {
-      r.sort(sortByTime);
-    } else if (keyType === "number") {
-      r.sort(sortByNumberSeries);
-    }
-    return r;
-  };
-
-  function detectXType(series, noDatetime, options) {
-    if (dataEmpty(series)) {
-      if ((options.xmin || options.xmax) && (!options.xmin || isDate(options.xmin)) && (!options.xmax || isDate(options.xmax))) {
-        return "datetime";
-      } else {
-        return "number";
-      }
-    } else if (detectXTypeWithFunction(series, isNumber)) {
-      return "number";
-    } else if (!noDatetime && detectXTypeWithFunction(series, isDate)) {
-      return "datetime";
-    } else {
-      return "string";
-    }
-  }
-
-  function detectXTypeWithFunction(series, func) {
-    var i, j, data;
-    for (i = 0; i < series.length; i++) {
-      data = toArr(series[i].data);
-      for (j = 0; j < data.length; j++) {
-        if (!func(data[j][0])) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-  // creates a shallow copy of each element of the array
-  // elements are expected to be objects
-  function copySeries(series) {
-    var newSeries = [], i, j;
-    for (i = 0; i < series.length; i++) {
-      var copy = {};
-      for (j in series[i]) {
-        if (series[i].hasOwnProperty(j)) {
-          copy[j] = series[i][j];
-        }
-      }
-      newSeries.push(copy);
-    }
-    return newSeries;
-  }
-
-  function processSeries(chart, keyType, noDatetime) {
-    var i;
-
-    var opts = chart.options;
-    var series = chart.rawData;
-
-    // see if one series or multiple
-    if (!isArray(series) || typeof series[0] !== "object" || isArray(series[0])) {
-      series = [{name: opts.label, data: series}];
-      chart.singleSeriesFormat = true;
-    } else {
-      chart.singleSeriesFormat = false;
-    }
-
-    // convert to array
-    // must come before dataEmpty check
-    series = copySeries(series);
-    for (i = 0; i < series.length; i++) {
-      series[i].data = toArr(series[i].data);
-    }
-
-    chart.xtype = keyType ? keyType : (opts.discrete ? "string" : detectXType(series, noDatetime, opts));
-
-    // right format
-    for (i = 0; i < series.length; i++) {
-      series[i].data = formatSeriesData(series[i].data, chart.xtype);
-    }
-
-    return series;
-  }
-
-  function processSimple(chart) {
-    var perfectData = toArr(chart.rawData), i;
-    for (i = 0; i < perfectData.length; i++) {
-      perfectData[i] = [toStr(perfectData[i][0]), toFloat(perfectData[i][1])];
-    }
-    return perfectData;
-  }
-
   // define classes
 
   var Chart = function Chart(element, dataSource, options) {
@@ -2193,8 +2186,8 @@
     if (this.adapter === "chartjs") {
       if (download && download.background && download.background !== "transparent") {
         // https://stackoverflow.com/questions/30464750/chartjs-line-chart-set-background-color
-        var canvas = this.chart.chart.canvas;
-        var ctx = this.chart.chart.ctx;
+        var canvas = this.chart.canvas;
+        var ctx = this.chart.ctx;
         var tmpCanvas = document.createElement("canvas");
         var tmpCtx = tmpCanvas.getContext("2d");
         tmpCanvas.width = ctx.canvas.width;