Skip to content

Business intelligence made simple

Updated Chart.js to 2.5.0

Andrew Kanea2753e2e088f
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 716bde37..e7ec3786 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 1.7.9 [unreleased]
- Added beta support for Apache Drill
+- Updated Chart.js to 2.5.0
## 1.7.8
diff --git a/app/assets/javascripts/blazer/Chart.js b/app/assets/javascripts/blazer/Chart.js
index 43241bd9..cdea31d6 100644
--- a/app/assets/javascripts/blazer/Chart.js
+++ b/app/assets/javascripts/blazer/Chart.js
@@ -1,9 +1,9 @@
/*!
* Chart.js
* http://chartjs.org/
- * Version: 2.2.2
+ * Version: 2.5.0
*
- * Copyright 2016 Nick Downie
+ * Copyright 2017 Nick Downie
* Released under the MIT license
* https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
*/
@@ -1665,33 +1665,36 @@ module.exports = {
/**
* @namespace Chart
*/
-var Chart = require(27)();
+var Chart = require(28)();
require(26)(Chart);
+require(42)(Chart);
require(22)(Chart);
+require(31)(Chart);
require(25)(Chart);
require(21)(Chart);
require(23)(Chart);
require(24)(Chart);
-require(28)(Chart);
-require(32)(Chart);
-require(30)(Chart);
-require(31)(Chart);
-require(33)(Chart);
require(29)(Chart);
+require(33)(Chart);
require(34)(Chart);
-
+require(32)(Chart);
require(35)(Chart);
+require(30)(Chart);
+require(27)(Chart);
require(36)(Chart);
+
require(37)(Chart);
require(38)(Chart);
-
-require(41)(Chart);
require(39)(Chart);
require(40)(Chart);
-require(42)(Chart);
+
+require(45)(Chart);
require(43)(Chart);
require(44)(Chart);
+require(46)(Chart);
+require(47)(Chart);
+require(48)(Chart);
// Controllers must be loaded after elements
// See Chart.core.datasetController.dataElementType
@@ -1712,8 +1715,8 @@ require(14)(Chart);
window.Chart = module.exports = Chart;
-},{"10":10,"11":11,"12":12,"13":13,"14":14,"15":15,"16":16,"17":17,"18":18,"19":19,"20":20,"21":21,"22":22,"23":23,"24":24,"25":25,"26":26,"27":27,"28":28,"29":29,"30":30,"31":31,"32":32,"33":33,"34":34,"35":35,"36":36,"37":37,"38":38,"39":39,"40":40,"41":41,"42":42,"43":43,"44":44,"8":8,"9":9}],8:[function(require,module,exports){
-"use strict";
+},{"10":10,"11":11,"12":12,"13":13,"14":14,"15":15,"16":16,"17":17,"18":18,"19":19,"20":20,"21":21,"22":22,"23":23,"24":24,"25":25,"26":26,"27":27,"28":28,"29":29,"30":30,"31":31,"32":32,"33":33,"34":34,"35":35,"36":36,"37":37,"38":38,"39":39,"40":40,"42":42,"43":43,"44":44,"45":45,"46":46,"47":47,"48":48,"8":8,"9":9}],8:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -1724,8 +1727,9 @@ module.exports = function(Chart) {
};
};
+
},{}],9:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -1735,8 +1739,9 @@ module.exports = function(Chart) {
};
};
+
},{}],10:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -1747,8 +1752,9 @@ module.exports = function(Chart) {
};
};
+
},{}],11:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -1759,8 +1765,9 @@ module.exports = function(Chart) {
};
};
+
},{}],12:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -1771,13 +1778,13 @@ module.exports = function(Chart) {
};
};
+
},{}],13:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
-
+
Chart.Radar = function(context, config) {
- config.options = Chart.helpers.configMerge({ aspectRatio: 1 }, config.options);
config.type = 'radar';
return new Chart(context, config);
@@ -1786,7 +1793,7 @@ module.exports = function(Chart) {
};
},{}],14:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -1797,14 +1804,14 @@ module.exports = function(Chart) {
scales: {
xAxes: [{
- type: "linear", // scatter should not use a category axis
- position: "bottom",
- id: "x-axis-1" // need an ID so datasets can reference the scale
+ type: 'linear', // scatter should not use a category axis
+ position: 'bottom',
+ id: 'x-axis-1' // need an ID so datasets can reference the scale
}],
yAxes: [{
- type: "linear",
- position: "left",
- id: "y-axis-1"
+ type: 'linear',
+ position: 'left',
+ id: 'y-axis-1'
}]
},
@@ -1833,8 +1840,9 @@ module.exports = function(Chart) {
};
};
+
},{}],15:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -1842,12 +1850,12 @@ module.exports = function(Chart) {
Chart.defaults.bar = {
hover: {
- mode: "label"
+ mode: 'label'
},
scales: {
xAxes: [{
- type: "category",
+ type: 'category',
// Specific to Bar Controller
categoryPercentage: 0.8,
@@ -1859,7 +1867,7 @@ module.exports = function(Chart) {
}
}],
yAxes: [{
- type: "linear"
+ type: 'linear'
}]
}
};
@@ -1871,21 +1879,33 @@ module.exports = function(Chart) {
initialize: function(chart, datasetIndex) {
Chart.DatasetController.prototype.initialize.call(this, chart, datasetIndex);
+ var me = this;
+ var meta = me.getMeta();
+ var dataset = me.getDataset();
+
+ meta.stack = dataset.stack;
// Use this to indicate that this is a bar dataset.
- this.getMeta().bar = true;
+ meta.bar = true;
},
- // Get the number of datasets that display bars. We use this to correctly calculate the bar width
- getBarCount: function() {
+ // Correctly calculate the bar width accounting for stacks and the fact that not all bars are visible
+ getStackCount: function() {
var me = this;
- var barCount = 0;
+ var meta = me.getMeta();
+ var yScale = me.getScaleForId(meta.yAxisID);
+
+ var stacks = [];
helpers.each(me.chart.data.datasets, function(dataset, datasetIndex) {
- var meta = me.chart.getDatasetMeta(datasetIndex);
- if (meta.bar && me.chart.isDatasetVisible(datasetIndex)) {
- ++barCount;
+ var dsMeta = me.chart.getDatasetMeta(datasetIndex);
+ if (dsMeta.bar && me.chart.isDatasetVisible(datasetIndex) &&
+ (yScale.options.stacked === false ||
+ (yScale.options.stacked === true && stacks.indexOf(dsMeta.stack) === -1) ||
+ (yScale.options.stacked === undefined && (dsMeta.stack === undefined || stacks.indexOf(dsMeta.stack) === -1)))) {
+ stacks.push(dsMeta.stack);
}
}, me);
- return barCount;
+
+ return stacks.length;
},
update: function(reset) {
@@ -1905,31 +1925,30 @@ module.exports = function(Chart) {
var custom = rectangle.custom || {};
var dataset = me.getDataset();
- helpers.extend(rectangle, {
- // Utility
- _xScale: xScale,
- _yScale: yScale,
- _datasetIndex: me.index,
- _index: index,
+ rectangle._xScale = xScale;
+ rectangle._yScale = yScale;
+ rectangle._datasetIndex = me.index;
+ rectangle._index = index;
- // Desired view properties
- _model: {
- x: me.calculateBarX(index, me.index),
- y: reset ? scaleBase : me.calculateBarY(index, me.index),
+ var ruler = me.getRuler(index); // The index argument for compatible
+ rectangle._model = {
+ x: me.calculateBarX(index, me.index, ruler),
+ y: reset ? scaleBase : me.calculateBarY(index, me.index),
- // Tooltip
- label: me.chart.data.labels[index],
- datasetLabel: dataset.label,
+ // Tooltip
+ label: me.chart.data.labels[index],
+ datasetLabel: dataset.label,
+
+ // Appearance
+ horizontal: false,
+ base: reset ? scaleBase : me.calculateBarBase(me.index, index),
+ width: me.calculateBarWidth(ruler),
+ backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor),
+ borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleElementOptions.borderSkipped,
+ borderColor: custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, rectangleElementOptions.borderColor),
+ borderWidth: custom.borderWidth ? custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, rectangleElementOptions.borderWidth)
+ };
- // Appearance
- base: reset ? scaleBase : me.calculateBarBase(me.index, index),
- width: me.calculateBarWidth(index),
- backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor),
- borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleElementOptions.borderSkipped,
- borderColor: custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, rectangleElementOptions.borderColor),
- borderWidth: custom.borderWidth ? custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, rectangleElementOptions.borderWidth)
- }
- });
rectangle.pivot();
},
@@ -1937,9 +1956,11 @@ module.exports = function(Chart) {
var me = this;
var meta = me.getMeta();
var yScale = me.getScaleForId(meta.yAxisID);
- var base = 0;
+ var base = yScale.getBaseValue();
+ var original = base;
- if (yScale.options.stacked) {
+ if ((yScale.options.stacked === true) ||
+ (yScale.options.stacked === undefined && meta.stack !== undefined)) {
var chart = me.chart;
var datasets = chart.data.datasets;
var value = Number(datasets[datasetIndex].data[index]);
@@ -1947,9 +1968,10 @@ module.exports = function(Chart) {
for (var i = 0; i < datasetIndex; i++) {
var currentDs = datasets[i];
var currentDsMeta = chart.getDatasetMeta(i);
- if (currentDsMeta.bar && currentDsMeta.yAxisID === yScale.id && chart.isDatasetVisible(i)) {
+ if (currentDsMeta.bar && currentDsMeta.yAxisID === yScale.id && chart.isDatasetVisible(i) &&
+ meta.stack === currentDsMeta.stack) {
var currentVal = Number(currentDs.data[index]);
- base += value < 0 ? Math.min(currentVal, 0) : Math.max(currentVal, 0);
+ base += value < 0 ? Math.min(currentVal, original) : Math.max(currentVal, original);
}
}
@@ -1959,34 +1981,22 @@ module.exports = function(Chart) {
return yScale.getBasePixel();
},
- getRuler: function(index) {
+ getRuler: function() {
var me = this;
var meta = me.getMeta();
var xScale = me.getScaleForId(meta.xAxisID);
- var datasetCount = me.getBarCount();
-
- var tickWidth;
+ var stackCount = me.getStackCount();
- if (xScale.options.type === 'category') {
- tickWidth = xScale.getPixelForTick(index + 1) - xScale.getPixelForTick(index);
- } else {
- // Average width
- tickWidth = xScale.width / xScale.ticks.length;
- }
+ var tickWidth = xScale.width / xScale.ticks.length;
var categoryWidth = tickWidth * xScale.options.categoryPercentage;
var categorySpacing = (tickWidth - (tickWidth * xScale.options.categoryPercentage)) / 2;
- var fullBarWidth = categoryWidth / datasetCount;
-
- if (xScale.ticks.length !== me.chart.data.labels.length) {
- var perc = xScale.ticks.length / me.chart.data.labels.length;
- fullBarWidth = fullBarWidth * perc;
- }
+ var fullBarWidth = categoryWidth / stackCount;
var barWidth = fullBarWidth * xScale.options.barPercentage;
var barSpacing = fullBarWidth - (fullBarWidth * xScale.options.barPercentage);
return {
- datasetCount: datasetCount,
+ stackCount: stackCount,
tickWidth: tickWidth,
categoryWidth: categoryWidth,
categorySpacing: categorySpacing,
@@ -1996,50 +2006,51 @@ module.exports = function(Chart) {
};
},
- calculateBarWidth: function(index) {
- var xScale = this.getScaleForId(this.getMeta().xAxisID);
+ calculateBarWidth: function(ruler) {
+ var me = this;
+ var meta = me.getMeta();
+ var xScale = me.getScaleForId(meta.xAxisID);
if (xScale.options.barThickness) {
return xScale.options.barThickness;
}
- var ruler = this.getRuler(index);
- return xScale.options.stacked ? ruler.categoryWidth : ruler.barWidth;
+ return ruler.barWidth;
},
- // Get bar index from the given dataset index accounting for the fact that not all bars are visible
- getBarIndex: function(datasetIndex) {
- var barIndex = 0;
- var meta, j;
+ // Get stack index from the given dataset index accounting for stacks and the fact that not all bars are visible
+ getStackIndex: function(datasetIndex) {
+ var me = this;
+ var meta = me.chart.getDatasetMeta(datasetIndex);
+ var yScale = me.getScaleForId(meta.yAxisID);
+ var dsMeta, j;
+ var stacks = [meta.stack];
for (j = 0; j < datasetIndex; ++j) {
- meta = this.chart.getDatasetMeta(j);
- if (meta.bar && this.chart.isDatasetVisible(j)) {
- ++barIndex;
+ dsMeta = this.chart.getDatasetMeta(j);
+ if (dsMeta.bar && this.chart.isDatasetVisible(j) &&
+ (yScale.options.stacked === false ||
+ (yScale.options.stacked === true && stacks.indexOf(dsMeta.stack) === -1) ||
+ (yScale.options.stacked === undefined && (dsMeta.stack === undefined || stacks.indexOf(dsMeta.stack) === -1)))) {
+ stacks.push(dsMeta.stack);
}
}
- return barIndex;
+ return stacks.length - 1;
},
- calculateBarX: function(index, datasetIndex) {
+ calculateBarX: function(index, datasetIndex, ruler) {
var me = this;
var meta = me.getMeta();
var xScale = me.getScaleForId(meta.xAxisID);
- var barIndex = me.getBarIndex(datasetIndex);
-
- var ruler = me.getRuler(index);
+ var stackIndex = me.getStackIndex(datasetIndex);
var leftTick = xScale.getPixelForValue(null, index, datasetIndex, me.chart.isCombo);
leftTick -= me.chart.isCombo ? (ruler.tickWidth / 2) : 0;
- if (xScale.options.stacked) {
- return leftTick + (ruler.categoryWidth / 2) + ruler.categorySpacing;
- }
-
return leftTick +
(ruler.barWidth / 2) +
ruler.categorySpacing +
- (ruler.barWidth * barIndex) +
+ (ruler.barWidth * stackIndex) +
(ruler.barSpacing / 2) +
- (ruler.barSpacing * barIndex);
+ (ruler.barSpacing * stackIndex);
},
calculateBarY: function(index, datasetIndex) {
@@ -2048,15 +2059,17 @@ module.exports = function(Chart) {
var yScale = me.getScaleForId(meta.yAxisID);
var value = Number(me.getDataset().data[index]);
- if (yScale.options.stacked) {
-
- var sumPos = 0,
- sumNeg = 0;
+ if (yScale.options.stacked ||
+ (yScale.options.stacked === undefined && meta.stack !== undefined)) {
+ var base = yScale.getBaseValue();
+ var sumPos = base,
+ sumNeg = base;
for (var i = 0; i < datasetIndex; i++) {
var ds = me.chart.data.datasets[i];
var dsMeta = me.chart.getDatasetMeta(i);
- if (dsMeta.bar && dsMeta.yAxisID === yScale.id && me.chart.isDatasetVisible(i)) {
+ if (dsMeta.bar && dsMeta.yAxisID === yScale.id && me.chart.isDatasetVisible(i) &&
+ meta.stack === dsMeta.stack) {
var stackedVal = Number(ds.data[index]);
if (stackedVal < 0) {
sumNeg += stackedVal || 0;
@@ -2068,9 +2081,8 @@ module.exports = function(Chart) {
if (value < 0) {
return yScale.getPixelForValue(sumNeg + value);
- } else {
- return yScale.getPixelForValue(sumPos + value);
}
+ return yScale.getPixelForValue(sumPos + value);
}
return yScale.getPixelForValue(value);
@@ -2079,12 +2091,18 @@ module.exports = function(Chart) {
draw: function(ease) {
var me = this;
var easingDecimal = ease || 1;
- helpers.each(me.getMeta().data, function(rectangle, index) {
- var d = me.getDataset().data[index];
+ var metaData = me.getMeta().data;
+ var dataset = me.getDataset();
+ var i, len;
+
+ Chart.canvasHelpers.clipArea(me.chart.chart.ctx, me.chart.chartArea);
+ for (i = 0, len = metaData.length; i < len; ++i) {
+ var d = dataset.data[i];
if (d !== null && d !== undefined && !isNaN(d)) {
- rectangle.transition(easingDecimal).draw();
+ metaData[i].transition(easingDecimal).draw();
}
- }, me);
+ }
+ Chart.canvasHelpers.unclipArea(me.chart.chart.ctx);
},
setHoverStyle: function(rectangle) {
@@ -2117,17 +2135,17 @@ module.exports = function(Chart) {
// it extends bar (like pie extends doughnut)
Chart.defaults.horizontalBar = {
hover: {
- mode: "label"
+ mode: 'label'
},
scales: {
xAxes: [{
- type: "linear",
- position: "bottom"
+ type: 'linear',
+ position: 'bottom'
}],
yAxes: [{
- position: "left",
- type: "category",
+ position: 'left',
+ type: 'category',
// Specific to Horizontal Bar Controller
categoryPercentage: 0.8,
@@ -2162,13 +2180,34 @@ module.exports = function(Chart) {
},
label: function(tooltipItem, data) {
var datasetLabel = data.datasets[tooltipItem.datasetIndex].label || '';
- return datasetLabel + ': ' + tooltipItem.xLabel;
+ return datasetLabel + ': ' + tooltipItem.xLabel;
}
}
}
};
Chart.controllers.horizontalBar = Chart.controllers.bar.extend({
+
+ // Correctly calculate the bar width accounting for stacks and the fact that not all bars are visible
+ getStackCount: function() {
+ var me = this;
+ var meta = me.getMeta();
+ var xScale = me.getScaleForId(meta.xAxisID);
+
+ var stacks = [];
+ helpers.each(me.chart.data.datasets, function(dataset, datasetIndex) {
+ var dsMeta = me.chart.getDatasetMeta(datasetIndex);
+ if (dsMeta.bar && me.chart.isDatasetVisible(datasetIndex) &&
+ (xScale.options.stacked === false ||
+ (xScale.options.stacked === true && stacks.indexOf(dsMeta.stack) === -1) ||
+ (xScale.options.stacked === undefined && (dsMeta.stack === undefined || stacks.indexOf(dsMeta.stack) === -1)))) {
+ stacks.push(dsMeta.stack);
+ }
+ }, me);
+
+ return stacks.length;
+ },
+
updateElement: function(rectangle, index, reset) {
var me = this;
var meta = me.getMeta();
@@ -2179,112 +2218,42 @@ module.exports = function(Chart) {
var dataset = me.getDataset();
var rectangleElementOptions = me.chart.options.elements.rectangle;
- helpers.extend(rectangle, {
- // Utility
- _xScale: xScale,
- _yScale: yScale,
- _datasetIndex: me.index,
- _index: index,
-
- // Desired view properties
- _model: {
- x: reset ? scaleBase : me.calculateBarX(index, me.index),
- y: me.calculateBarY(index, me.index),
-
- // Tooltip
- label: me.chart.data.labels[index],
- datasetLabel: dataset.label,
-
- // Appearance
- base: reset ? scaleBase : me.calculateBarBase(me.index, index),
- height: me.calculateBarHeight(index),
- backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor),
- borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleElementOptions.borderSkipped,
- borderColor: custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, rectangleElementOptions.borderColor),
- borderWidth: custom.borderWidth ? custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, rectangleElementOptions.borderWidth)
- },
-
- draw: function () {
- var ctx = this._chart.ctx;
- var vm = this._view;
-
- var halfHeight = vm.height / 2,
- topY = vm.y - halfHeight,
- bottomY = vm.y + halfHeight,
- right = vm.base - (vm.base - vm.x),
- halfStroke = vm.borderWidth / 2;
-
- // Canvas doesn't allow us to stroke inside the width so we can
- // adjust the sizes to fit if we're setting a stroke on the line
- if (vm.borderWidth) {
- topY += halfStroke;
- bottomY -= halfStroke;
- right += halfStroke;
- }
-
- ctx.beginPath();
-
- ctx.fillStyle = vm.backgroundColor;
- ctx.strokeStyle = vm.borderColor;
- ctx.lineWidth = vm.borderWidth;
-
- // Corner points, from bottom-left to bottom-right clockwise
- // | 1 2 |
- // | 0 3 |
- var corners = [
- [vm.base, bottomY],
- [vm.base, topY],
- [right, topY],
- [right, bottomY]
- ];
-
- // Find first (starting) corner with fallback to 'bottom'
- var borders = ['bottom', 'left', 'top', 'right'];
- var startCorner = borders.indexOf(vm.borderSkipped, 0);
- if (startCorner === -1)
- startCorner = 0;
-
- function cornerAt(index) {
- return corners[(startCorner + index) % 4];
- }
-
- // Draw rectangle from 'startCorner'
- ctx.moveTo.apply(ctx, cornerAt(0));
- for (var i = 1; i < 4; i++)
- ctx.lineTo.apply(ctx, cornerAt(i));
-
- ctx.fill();
- if (vm.borderWidth) {
- ctx.stroke();
- }
- },
+ rectangle._xScale = xScale;
+ rectangle._yScale = yScale;
+ rectangle._datasetIndex = me.index;
+ rectangle._index = index;
- inRange: function (mouseX, mouseY) {
- var vm = this._view;
- var inRange = false;
+ var ruler = me.getRuler(index); // The index argument for compatible
+ rectangle._model = {
+ x: reset ? scaleBase : me.calculateBarX(index, me.index),
+ y: me.calculateBarY(index, me.index, ruler),
- if (vm) {
- if (vm.x < vm.base) {
- inRange = (mouseY >= vm.y - vm.height / 2 && mouseY <= vm.y + vm.height / 2) && (mouseX >= vm.x && mouseX <= vm.base);
- } else {
- inRange = (mouseY >= vm.y - vm.height / 2 && mouseY <= vm.y + vm.height / 2) && (mouseX >= vm.base && mouseX <= vm.x);
- }
- }
+ // Tooltip
+ label: me.chart.data.labels[index],
+ datasetLabel: dataset.label,
- return inRange;
- }
- });
+ // Appearance
+ horizontal: true,
+ base: reset ? scaleBase : me.calculateBarBase(me.index, index),
+ height: me.calculateBarHeight(ruler),
+ backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor),
+ borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleElementOptions.borderSkipped,
+ borderColor: custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, rectangleElementOptions.borderColor),
+ borderWidth: custom.borderWidth ? custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, rectangleElementOptions.borderWidth)
+ };
rectangle.pivot();
},
- calculateBarBase: function (datasetIndex, index) {
+ calculateBarBase: function(datasetIndex, index) {
var me = this;
var meta = me.getMeta();
var xScale = me.getScaleForId(meta.xAxisID);
- var base = 0;
+ var base = xScale.getBaseValue();
+ var originalBase = base;
- if (xScale.options.stacked) {
+ if (xScale.options.stacked ||
+ (xScale.options.stacked === undefined && meta.stack !== undefined)) {
var chart = me.chart;
var datasets = chart.data.datasets;
var value = Number(datasets[datasetIndex].data[index]);
@@ -2292,9 +2261,10 @@ module.exports = function(Chart) {
for (var i = 0; i < datasetIndex; i++) {
var currentDs = datasets[i];
var currentDsMeta = chart.getDatasetMeta(i);
- if (currentDsMeta.bar && currentDsMeta.xAxisID === xScale.id && chart.isDatasetVisible(i)) {
+ if (currentDsMeta.bar && currentDsMeta.xAxisID === xScale.id && chart.isDatasetVisible(i) &&
+ meta.stack === currentDsMeta.stack) {
var currentVal = Number(currentDs.data[index]);
- base += value < 0 ? Math.min(currentVal, 0) : Math.max(currentVal, 0);
+ base += value < 0 ? Math.min(currentVal, originalBase) : Math.max(currentVal, originalBase);
}
}
@@ -2304,33 +2274,22 @@ module.exports = function(Chart) {
return xScale.getBasePixel();
},
- getRuler: function (index) {
+ getRuler: function() {
var me = this;
var meta = me.getMeta();
var yScale = me.getScaleForId(meta.yAxisID);
- var datasetCount = me.getBarCount();
+ var stackCount = me.getStackCount();
- var tickHeight;
- if (yScale.options.type === 'category') {
- tickHeight = yScale.getPixelForTick(index + 1) - yScale.getPixelForTick(index);
- } else {
- // Average width
- tickHeight = yScale.width / yScale.ticks.length;
- }
+ var tickHeight = yScale.height / yScale.ticks.length;
var categoryHeight = tickHeight * yScale.options.categoryPercentage;
var categorySpacing = (tickHeight - (tickHeight * yScale.options.categoryPercentage)) / 2;
- var fullBarHeight = categoryHeight / datasetCount;
-
- if (yScale.ticks.length !== me.chart.data.labels.length) {
- var perc = yScale.ticks.length / me.chart.data.labels.length;
- fullBarHeight = fullBarHeight * perc;
- }
+ var fullBarHeight = categoryHeight / stackCount;
var barHeight = fullBarHeight * yScale.options.barPercentage;
var barSpacing = fullBarHeight - (fullBarHeight * yScale.options.barPercentage);
return {
- datasetCount: datasetCount,
+ stackCount: stackCount,
tickHeight: tickHeight,
categoryHeight: categoryHeight,
categorySpacing: categorySpacing,
@@ -2340,31 +2299,54 @@ module.exports = function(Chart) {
};
},
- calculateBarHeight: function (index) {
+ calculateBarHeight: function(ruler) {
var me = this;
- var yScale = me.getScaleForId(me.getMeta().yAxisID);
+ var meta = me.getMeta();
+ var yScale = me.getScaleForId(meta.yAxisID);
if (yScale.options.barThickness) {
return yScale.options.barThickness;
}
- var ruler = me.getRuler(index);
- return yScale.options.stacked ? ruler.categoryHeight : ruler.barHeight;
+ return ruler.barHeight;
+ },
+
+ // Get stack index from the given dataset index accounting for stacks and the fact that not all bars are visible
+ getStackIndex: function(datasetIndex) {
+ var me = this;
+ var meta = me.chart.getDatasetMeta(datasetIndex);
+ var xScale = me.getScaleForId(meta.xAxisID);
+ var dsMeta, j;
+ var stacks = [meta.stack];
+
+ for (j = 0; j < datasetIndex; ++j) {
+ dsMeta = this.chart.getDatasetMeta(j);
+ if (dsMeta.bar && this.chart.isDatasetVisible(j) &&
+ (xScale.options.stacked === false ||
+ (xScale.options.stacked === true && stacks.indexOf(dsMeta.stack) === -1) ||
+ (xScale.options.stacked === undefined && (dsMeta.stack === undefined || stacks.indexOf(dsMeta.stack) === -1)))) {
+ stacks.push(dsMeta.stack);
+ }
+ }
+
+ return stacks.length - 1;
},
- calculateBarX: function (index, datasetIndex) {
+ calculateBarX: function(index, datasetIndex) {
var me = this;
var meta = me.getMeta();
var xScale = me.getScaleForId(meta.xAxisID);
var value = Number(me.getDataset().data[index]);
- if (xScale.options.stacked) {
-
- var sumPos = 0,
- sumNeg = 0;
+ if (xScale.options.stacked ||
+ (xScale.options.stacked === undefined && meta.stack !== undefined)) {
+ var base = xScale.getBaseValue();
+ var sumPos = base,
+ sumNeg = base;
for (var i = 0; i < datasetIndex; i++) {
var ds = me.chart.data.datasets[i];
var dsMeta = me.chart.getDatasetMeta(i);
- if (dsMeta.bar && dsMeta.xAxisID === xScale.id && me.chart.isDatasetVisible(i)) {
+ if (dsMeta.bar && dsMeta.xAxisID === xScale.id && me.chart.isDatasetVisible(i) &&
+ meta.stack === dsMeta.stack) {
var stackedVal = Number(ds.data[index]);
if (stackedVal < 0) {
sumNeg += stackedVal || 0;
@@ -2376,40 +2358,33 @@ module.exports = function(Chart) {
if (value < 0) {
return xScale.getPixelForValue(sumNeg + value);
- } else {
- return xScale.getPixelForValue(sumPos + value);
}
+ return xScale.getPixelForValue(sumPos + value);
}
return xScale.getPixelForValue(value);
},
- calculateBarY: function (index, datasetIndex) {
+ calculateBarY: function(index, datasetIndex, ruler) {
var me = this;
var meta = me.getMeta();
var yScale = me.getScaleForId(meta.yAxisID);
- var barIndex = me.getBarIndex(datasetIndex);
-
- var ruler = me.getRuler(index);
+ var stackIndex = me.getStackIndex(datasetIndex);
var topTick = yScale.getPixelForValue(null, index, datasetIndex, me.chart.isCombo);
topTick -= me.chart.isCombo ? (ruler.tickHeight / 2) : 0;
- if (yScale.options.stacked) {
- return topTick + (ruler.categoryHeight / 2) + ruler.categorySpacing;
- }
-
return topTick +
(ruler.barHeight / 2) +
ruler.categorySpacing +
- (ruler.barHeight * barIndex) +
+ (ruler.barHeight * stackIndex) +
(ruler.barSpacing / 2) +
- (ruler.barSpacing * barIndex);
+ (ruler.barSpacing * stackIndex);
}
});
};
},{}],16:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -2417,19 +2392,19 @@ module.exports = function(Chart) {
Chart.defaults.bubble = {
hover: {
- mode: "single"
+ mode: 'single'
},
scales: {
xAxes: [{
- type: "linear", // bubble should probably use a linear scale by default
- position: "bottom",
- id: "x-axis-0" // need an ID so datasets can reference the scale
+ type: 'linear', // bubble should probably use a linear scale by default
+ position: 'bottom',
+ id: 'x-axis-0' // need an ID so datasets can reference the scale
}],
yAxes: [{
- type: "linear",
- position: "left",
- id: "y-axis-0"
+ type: 'linear',
+ position: 'left',
+ id: 'y-axis-0'
}]
},
@@ -2442,7 +2417,7 @@ module.exports = function(Chart) {
label: function(tooltipItem, data) {
var datasetLabel = data.datasets[tooltipItem.datasetIndex].label || '';
var dataPoint = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
- return datasetLabel + ': (' + dataPoint.x + ', ' + dataPoint.y + ', ' + dataPoint.r + ')';
+ return datasetLabel + ': (' + tooltipItem.xLabel + ', ' + tooltipItem.yLabel + ', ' + dataPoint.r + ')';
}
}
}
@@ -2533,7 +2508,7 @@ module.exports = function(Chart) {
};
},{}],17:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -2542,9 +2517,9 @@ module.exports = function(Chart) {
defaults.doughnut = {
animation: {
- //Boolean - Whether we animate the rotation of the Doughnut
+ // Boolean - Whether we animate the rotation of the Doughnut
animateRotate: true,
- //Boolean - Whether we animate scaling the Doughnut from the centre
+ // Boolean - Whether we animate scaling the Doughnut from the centre
animateScale: false
},
aspectRatio: 1,
@@ -2570,7 +2545,7 @@ module.exports = function(Chart) {
}
text.push('</ul>');
- return text.join("");
+ return text.join('');
},
legend: {
labels: {
@@ -2599,9 +2574,8 @@ module.exports = function(Chart) {
index: i
};
});
- } else {
- return [];
}
+ return [];
}
},
@@ -2612,20 +2586,23 @@ module.exports = function(Chart) {
for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
meta = chart.getDatasetMeta(i);
- meta.data[index].hidden = !meta.data[index].hidden;
+ // toggle visibility of index if exists
+ if (meta.data[index]) {
+ meta.data[index].hidden = !meta.data[index].hidden;
+ }
}
chart.update();
}
},
- //The percentage of the chart that we cut out of the middle.
+ // The percentage of the chart that we cut out of the middle.
cutoutPercentage: 50,
- //The rotation of the chart, where the first data arc begins.
+ // The rotation of the chart, where the first data arc begins.
rotation: Math.PI * -0.5,
- //The total circumference of the chart.
+ // The total circumference of the chart.
circumference: Math.PI * 2.0,
// Need to override these to give a nice default
@@ -2635,7 +2612,19 @@ module.exports = function(Chart) {
return '';
},
label: function(tooltipItem, data) {
- return data.labels[tooltipItem.index] + ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
+ var dataLabel = data.labels[tooltipItem.index];
+ var value = ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
+
+ if (helpers.isArray(dataLabel)) {
+ // show value on first line of multiline label
+ // need to clone because we are changing the value
+ dataLabel = dataLabel.slice();
+ dataLabel[0] += value;
+ } else {
+ dataLabel += value;
+ }
+
+ return dataLabel;
}
}
}
@@ -2701,10 +2690,10 @@ module.exports = function(Chart) {
minSize = Math.min(availableWidth / size.width, availableHeight / size.height);
offset = {x: (max.x + min.x) * -0.5, y: (max.y + min.y) * -0.5};
}
- chart.borderWidth = me.getMaxBorderWidth(meta.data);
+ chart.borderWidth = me.getMaxBorderWidth(meta.data);
chart.outerRadius = Math.max((minSize - chart.borderWidth) / 2, 0);
- chart.innerRadius = Math.max(cutoutPercentage ? (chart.outerRadius / 100) * (cutoutPercentage) : 1, 0);
+ chart.innerRadius = Math.max(cutoutPercentage ? (chart.outerRadius / 100) * (cutoutPercentage) : 0, 0);
chart.radiusLength = (chart.outerRadius - chart.innerRadius) / chart.getVisibleDatasetCount();
chart.offsetX = offset.x * chart.outerRadius;
chart.offsetY = offset.y * chart.outerRadius;
@@ -2712,7 +2701,7 @@ module.exports = function(Chart) {
meta.total = me.calculateTotal();
me.outerRadius = chart.outerRadius - (chart.radiusLength * me.getRingIndex(me.index));
- me.innerRadius = me.outerRadius - chart.radiusLength;
+ me.innerRadius = Math.max(me.outerRadius - chart.radiusLength, 0);
helpers.each(meta.data, function(arc, index) {
me.updateElement(arc, index, reset);
@@ -2788,7 +2777,7 @@ module.exports = function(Chart) {
}
});
- /*if (total === 0) {
+ /* if (total === 0) {
total = NaN;
}*/
@@ -2799,33 +2788,32 @@ module.exports = function(Chart) {
var total = this.getMeta().total;
if (total > 0 && !isNaN(value)) {
return (Math.PI * 2.0) * (value / total);
- } else {
- return 0;
}
+ return 0;
},
-
- //gets the max border or hover width to properly scale pie charts
- getMaxBorderWidth: function (elements) {
- var max = 0,
+
+ // gets the max border or hover width to properly scale pie charts
+ getMaxBorderWidth: function(elements) {
+ var max = 0,
index = this.index,
length = elements.length,
borderWidth,
hoverWidth;
- for (var i = 0; i < length; i++) {
- borderWidth = elements[i]._model ? elements[i]._model.borderWidth : 0;
- hoverWidth = elements[i]._chart ? elements[i]._chart.config.data.datasets[index].hoverBorderWidth : 0;
-
- max = borderWidth > max ? borderWidth : max;
- max = hoverWidth > max ? hoverWidth : max;
- }
- return max;
- }
+ for (var i = 0; i < length; i++) {
+ borderWidth = elements[i]._model ? elements[i]._model.borderWidth : 0;
+ hoverWidth = elements[i]._chart ? elements[i]._chart.config.data.datasets[index].hoverBorderWidth : 0;
+
+ max = borderWidth > max ? borderWidth : max;
+ max = hoverWidth > max ? hoverWidth : max;
+ }
+ return max;
+ }
});
};
},{}],18:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -2836,16 +2824,16 @@ module.exports = function(Chart) {
spanGaps: false,
hover: {
- mode: "label"
+ mode: 'label'
},
scales: {
xAxes: [{
- type: "category",
+ type: 'category',
id: 'x-axis-0'
}],
yAxes: [{
- type: "linear",
+ type: 'linear',
id: 'y-axis-0'
}]
}
@@ -2861,19 +2849,6 @@ module.exports = function(Chart) {
dataElementType: Chart.elements.Point,
- addElementAndReset: function(index) {
- var me = this;
- var options = me.chart.options;
- var meta = me.getMeta();
-
- Chart.DatasetController.prototype.addElementAndReset.call(me, index);
-
- // Make sure bezier control points are updated
- if (lineEnabled(me.getDataset(), options) && meta.dataset._model.tension !== 0) {
- me.updateBezierControlPoints();
- }
- },
-
update: function(reset) {
var me = this;
var meta = me.getMeta();
@@ -2905,7 +2880,7 @@ module.exports = function(Chart) {
// Appearance
// The default behavior of lines is to break at null values, according
// to https://github.com/chartjs/Chart.js/issues/2435#issuecomment-216718158
- // This option gives linse the ability to span gaps
+ // This option gives lines the ability to span gaps
spanGaps: dataset.spanGaps ? dataset.spanGaps : options.spanGaps,
tension: custom.tension ? custom.tension : helpers.getValueOrDefault(dataset.lineTension, lineElementOptions.tension),
backgroundColor: custom.backgroundColor ? custom.backgroundColor : (dataset.backgroundColor || lineElementOptions.backgroundColor),
@@ -2979,11 +2954,11 @@ module.exports = function(Chart) {
var dataset = this.getDataset();
var custom = point.custom || {};
- if (custom.borderWidth) {
+ if (!isNaN(custom.borderWidth)) {
borderWidth = custom.borderWidth;
- } else if (dataset.pointBorderWidth) {
+ } else if (!isNaN(dataset.pointBorderWidth)) {
borderWidth = helpers.getValueAtIndexOrDefault(dataset.pointBorderWidth, index, borderWidth);
- } else if (dataset.borderWidth) {
+ } else if (!isNaN(dataset.borderWidth)) {
borderWidth = dataset.borderWidth;
}
@@ -3065,9 +3040,8 @@ module.exports = function(Chart) {
var rightValue = Number(yScale.getRightValue(value));
if (rightValue < 0) {
return yScale.getPixelForValue(sumNeg + rightValue);
- } else {
- return yScale.getPixelForValue(sumPos + rightValue);
}
+ return yScale.getPixelForValue(sumPos + rightValue);
}
return yScale.getPixelForValue(value);
@@ -3077,20 +3051,23 @@ module.exports = function(Chart) {
var me = this;
var meta = me.getMeta();
var area = me.chart.chartArea;
-
- // Only consider points that are drawn in case the spanGaps option is used
var points = (meta.data || []);
- if (meta.dataset._model.spanGaps) points = points.filter(function(pt) { return !pt._model.skip; });
var i, ilen, point, model, controlPoints;
+ // Only consider points that are drawn in case the spanGaps option is used
+ if (meta.dataset._model.spanGaps) {
+ points = points.filter(function(pt) {
+ return !pt._model.skip;
+ });
+ }
+
function capControlPoint(pt, min, max) {
return Math.max(Math.min(pt, max), min);
}
- if (meta.dataset._model.cubicInterpolationMode == 'monotone') {
+ if (meta.dataset._model.cubicInterpolationMode === 'monotone') {
helpers.splineCurveMonotone(points);
- }
- else {
+ } else {
for (i = 0, ilen = points.length; i < ilen; ++i) {
point = points[i];
model = point._model;
@@ -3116,7 +3093,6 @@ module.exports = function(Chart) {
model.controlPointNextY = capControlPoint(model.controlPointNextY, area.top, area.bottom);
}
}
-
},
draw: function(ease) {
@@ -3131,14 +3107,16 @@ module.exports = function(Chart) {
points[i].transition(easingDecimal);
}
+ Chart.canvasHelpers.clipArea(me.chart.chart.ctx, me.chart.chartArea);
// Transition and Draw the line
if (lineEnabled(me.getDataset(), me.chart.options)) {
meta.dataset.transition(easingDecimal).draw();
}
+ Chart.canvasHelpers.unclipArea(me.chart.chart.ctx);
// Draw the points
for (i=0, ilen=points.length; i<ilen; ++i) {
- points[i].draw();
+ points[i].draw(me.chart.chartArea);
}
},
@@ -3176,7 +3154,7 @@ module.exports = function(Chart) {
};
},{}],19:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
@@ -3185,14 +3163,14 @@ module.exports = function(Chart) {
Chart.defaults.polarArea = {
scale: {
- type: "radialLinear",
+ type: 'radialLinear',
lineArc: true, // so that lines are circular
ticks: {
beginAtZero: true
}
},
- //Boolean - Whether to animate the rotation of the chart
+ // Boolean - Whether to animate the rotation of the chart
animation: {
animateRotate: true,
animateScale: true
@@ -3210,16 +3188,16 @@ module.exports = function(Chart) {
if (datasets.length) {
for (var i = 0; i < datasets[0].data.length; ++i) {
- text.push('<li><span style="background-color:' + datasets[0].backgroundColor[i] + '">');
+ text.push('<li><span style="background-color:' + datasets[0].backgroundColor[i] + '"></span>');
if (labels[i]) {
text.push(labels[i]);
}
- text.push('</span></li>');
+ text.push('</li>');
}
}
text.push('</ul>');
- return text.join("");
+ return text.join('');
},
legend: {
labels: {
@@ -3248,9 +3226,8 @@ module.exports = function(Chart) {
index: i
};
});
- } else {
- return [];
}
+ return [];
}
},
@@ -3333,7 +3310,7 @@ module.exports = function(Chart) {
}
}
- //var negHalfPI = -0.5 * Math.PI;
+ // var negHalfPI = -0.5 * Math.PI;
var datasetStartAngle = opts.startAngle;
var distance = arc.hidden ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
var startAngle = datasetStartAngle + (circumference * visibleCount);
@@ -3387,23 +3364,23 @@ module.exports = function(Chart) {
var count = this.getMeta().count;
if (count > 0 && !isNaN(value)) {
return (2 * Math.PI) / count;
- } else {
- return 0;
}
+ return 0;
}
});
};
},{}],20:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
var helpers = Chart.helpers;
Chart.defaults.radar = {
+ aspectRatio: 1,
scale: {
- type: "radialLinear"
+ type: 'radialLinear'
},
elements: {
line: {
@@ -3420,13 +3397,6 @@ module.exports = function(Chart) {
linkScales: helpers.noop,
- addElementAndReset: function(index) {
- Chart.DatasetController.prototype.addElementAndReset.call(this, index);
-
- // Make sure bezier control points are updated
- this.updateBezierControlPoints();
- },
-
update: function(reset) {
var me = this;
var meta = me.getMeta();
@@ -3475,7 +3445,6 @@ module.exports = function(Chart) {
me.updateElement(point, index, reset);
}, me);
-
// Update bezier control points
me.updateBezierControlPoints();
},
@@ -3499,7 +3468,7 @@ module.exports = function(Chart) {
y: reset ? scale.yCenter : pointPosition.y,
// Appearance
- tension: custom.tension ? custom.tension : helpers.getValueOrDefault(dataset.tension, me.chart.options.elements.line.tension),
+ tension: custom.tension ? custom.tension : helpers.getValueOrDefault(dataset.lineTension, me.chart.options.elements.line.tension),
radius: custom.radius ? custom.radius : helpers.getValueAtIndexOrDefault(dataset.pointRadius, index, pointElementOptions.radius),
backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.pointBackgroundColor, index, pointElementOptions.backgroundColor),
borderColor: custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.pointBorderColor, index, pointElementOptions.borderColor),
@@ -3585,8 +3554,8 @@ module.exports = function(Chart) {
};
},{}],21:[function(require,module,exports){
-/*global window: false */
-"use strict";
+/* global window: false */
+'use strict';
module.exports = function(Chart) {
@@ -3594,7 +3563,7 @@ module.exports = function(Chart) {
Chart.defaults.global.animation = {
duration: 1000,
- easing: "easeOutQuart",
+ easing: 'easeOutQuart',
onProgress: helpers.noop,
onComplete: helpers.noop
};
@@ -3602,7 +3571,7 @@ module.exports = function(Chart) {
Chart.Animation = Chart.Element.extend({
currentStep: null, // the current animation step
numSteps: 60, // default number of steps
- easing: "", // the easing to use for this animation
+ easing: '', // the easing to use for this animation
render: null, // render function used by the animation service
onAnimationProgress: null, // user specified callback to fire on each step of the animation
@@ -3614,6 +3583,14 @@ module.exports = function(Chart) {
animations: [],
dropFrames: 0,
request: null,
+
+ /**
+ * @function Chart.animationService.addAnimation
+ * @param chartInstance {ChartController} the chart to animate
+ * @param animationObject {IAnimation} the animation that we will animate
+ * @param duration {Number} length of animation in ms
+ * @param lazy {Boolean} if true, the chart is not marked as animating to enable more responsive interactions
+ */
addAnimation: function(chartInstance, animationObject, duration, lazy) {
var me = this;
@@ -3716,8 +3693,9 @@ module.exports = function(Chart) {
}
};
};
+
},{}],22:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
// Global Chart canvas helpers object for drawing items to canvas
@@ -3759,9 +3737,17 @@ module.exports = function(Chart) {
case 'rect':
size = 1 / Math.SQRT2 * radius;
ctx.beginPath();
- ctx.fillRect(x - size, y - size, 2 * size, 2 * size);
+ ctx.fillRect(x - size, y - size, 2 * size, 2 * size);
ctx.strokeRect(x - size, y - size, 2 * size, 2 * size);
break;
+ case 'rectRounded':
+ var offset = radius / Math.SQRT2;
+ var leftX = x - offset;
+ var topY = y - offset;
+ var sideSize = Math.SQRT2 * radius;
+ Chart.helpers.drawRoundedRectangle(ctx, leftX, topY, sideSize, sideSize, radius / 2);
+ ctx.fill();
+ break;
case 'rectRot':
size = 1 / Math.SQRT2 * radius;
ctx.beginPath();
@@ -3820,74 +3806,153 @@ module.exports = function(Chart) {
ctx.stroke();
};
+
+ helpers.clipArea = function(ctx, clipArea) {
+ ctx.save();
+ ctx.beginPath();
+ ctx.rect(clipArea.left, clipArea.top, clipArea.right - clipArea.left, clipArea.bottom - clipArea.top);
+ ctx.clip();
+ };
+
+ helpers.unclipArea = function(ctx) {
+ ctx.restore();
+ };
+
};
+
},{}],23:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
var helpers = Chart.helpers;
- //Create a dictionary of chart types, to allow for extension of existing types
+ var plugins = Chart.plugins;
+ var platform = Chart.platform;
+
+ // Create a dictionary of chart types, to allow for extension of existing types
Chart.types = {};
- //Store a reference to each instance - allowing us to globally resize chart instances on window resize.
- //Destroy method on the chart will remove the instance of the chart from this reference.
+ // Store a reference to each instance - allowing us to globally resize chart instances on window resize.
+ // Destroy method on the chart will remove the instance of the chart from this reference.
Chart.instances = {};
// Controllers available for dataset visualization eg. bar, line, slice, etc.
Chart.controllers = {};
+ /**
+ * Initializes the given config with global and chart default values.
+ */
+ function initConfig(config) {
+ config = config || {};
+
+ // Do NOT use configMerge() for the data object because this method merges arrays
+ // and so would change references to labels and datasets, preventing data updates.
+ var data = config.data = config.data || {};
+ data.datasets = data.datasets || [];
+ data.labels = data.labels || [];
+
+ config.options = helpers.configMerge(
+ Chart.defaults.global,
+ Chart.defaults[config.type],
+ config.options || {});
+
+ return config;
+ }
+
+ /**
+ * Updates the config of the chart
+ * @param chart {Chart.Controller} chart to update the options for
+ */
+ function updateConfig(chart) {
+ var newOptions = chart.options;
+
+ // Update Scale(s) with options
+ if (newOptions.scale) {
+ chart.scale.options = newOptions.scale;
+ } else if (newOptions.scales) {
+ newOptions.scales.xAxes.concat(newOptions.scales.yAxes).forEach(function(scaleOptions) {
+ chart.scales[scaleOptions.id].options = scaleOptions;
+ });
+ }
+
+ // Tooltip
+ chart.tooltip._options = newOptions.tooltips;
+ }
+
/**
* @class Chart.Controller
* The main controller of a chart.
*/
- Chart.Controller = function(instance) {
+ Chart.Controller = function(item, config, instance) {
+ var me = this;
+
+ config = initConfig(config);
- this.chart = instance;
- this.config = instance.config;
- this.options = this.config.options = helpers.configMerge(Chart.defaults.global, Chart.defaults[this.config.type], this.config.options || {});
- this.id = helpers.uid();
+ var context = platform.acquireContext(item, config);
+ var canvas = context && context.canvas;
+ var height = canvas && canvas.height;
+ var width = canvas && canvas.width;
- Object.defineProperty(this, 'data', {
+ instance.ctx = context;
+ instance.canvas = canvas;
+ instance.config = config;
+ instance.width = width;
+ instance.height = height;
+ instance.aspectRatio = height? width / height : null;
+
+ me.id = helpers.uid();
+ me.chart = instance;
+ me.config = config;
+ me.options = config.options;
+ me._bufferedRender = false;
+
+ // Add the chart instance to the global namespace
+ Chart.instances[me.id] = me;
+
+ Object.defineProperty(me, 'data', {
get: function() {
- return this.config.data;
+ return me.config.data;
}
});
- //Add the chart instance to the global namespace
- Chart.instances[this.id] = this;
-
- if (this.options.responsive) {
- // Silent resize before chart draws
- this.resize(true);
+ if (!context || !canvas) {
+ // The given item is not a compatible context2d element, let's return before finalizing
+ // the chart initialization but after setting basic chart / controller properties that
+ // can help to figure out that the chart is not valid (e.g chart.canvas !== null);
+ // https://github.com/chartjs/Chart.js/issues/2807
+ console.error("Failed to create chart: can't acquire context from the given item");
+ return me;
}
- this.initialize();
+ me.initialize();
+ me.update();
- return this;
+ return me;
};
- helpers.extend(Chart.Controller.prototype, /** @lends Chart.Controller */ {
-
+ helpers.extend(Chart.Controller.prototype, /** @lends Chart.Controller.prototype */ {
initialize: function() {
var me = this;
+
// Before init plugin notification
- Chart.plugins.notify('beforeInit', [me]);
+ plugins.notify(me, 'beforeInit');
+
+ helpers.retinaScale(me.chart);
me.bindEvents();
- // Make sure controllers are built first so that each dataset is bound to an axis before the scales
- // are built
+ if (me.options.responsive) {
+ // Initial resize before chart draws (must be silent to preserve initial animations).
+ me.resize(true);
+ }
+
+ // Make sure scales have IDs and are built before we build any controllers.
me.ensureScalesHaveIDs();
- me.buildOrUpdateControllers();
me.buildScales();
- me.updateLayout();
- me.resetElements();
me.initToolTip();
- me.update();
// After init plugin notification
- Chart.plugins.notify('afterInit', [me]);
+ plugins.notify(me, 'afterInit');
return me;
},
@@ -3898,45 +3963,47 @@ module.exports = function(Chart) {
},
stop: function() {
- // Stops any current animation loop occuring
+ // Stops any current animation loop occurring
Chart.animationService.cancelAnimation(this);
return this;
},
- resize: function resize(silent) {
+ resize: function(silent) {
var me = this;
var chart = me.chart;
+ var options = me.options;
var canvas = chart.canvas;
- var newWidth = helpers.getMaximumWidth(canvas);
- var aspectRatio = chart.aspectRatio;
- var newHeight = (me.options.maintainAspectRatio && isNaN(aspectRatio) === false && isFinite(aspectRatio) && aspectRatio !== 0) ? newWidth / aspectRatio : helpers.getMaximumHeight(canvas);
+ var aspectRatio = (options.maintainAspectRatio && chart.aspectRatio) || null;
- var sizeChanged = chart.width !== newWidth || chart.height !== newHeight;
+ // the canvas render width and height will be casted to integers so make sure that
+ // the canvas display style uses the same integer values to avoid blurring effect.
+ var newWidth = Math.floor(helpers.getMaximumWidth(canvas));
+ var newHeight = Math.floor(aspectRatio? newWidth / aspectRatio : helpers.getMaximumHeight(canvas));
- if (!sizeChanged) {
- return me;
+ if (chart.width === newWidth && chart.height === newHeight) {
+ return;
}
canvas.width = chart.width = newWidth;
canvas.height = chart.height = newHeight;
+ canvas.style.width = newWidth + 'px';
+ canvas.style.height = newHeight + 'px';
helpers.retinaScale(chart);
- // Notify any plugins about the resize
- var newSize = { width: newWidth, height: newHeight };
- Chart.plugins.notify('resize', [me, newSize]);
+ if (!silent) {
+ // Notify any plugins about the resize
+ var newSize = {width: newWidth, height: newHeight};
+ plugins.notify(me, 'resize', [newSize]);
- // Notify of resize
- if (me.options.onResize) {
- me.options.onResize(me, newSize);
- }
+ // Notify of resize
+ if (me.options.onResize) {
+ me.options.onResize(me, newSize);
+ }
- if (!silent) {
me.stop();
me.update(me.options.responsiveAnimationDuration);
}
-
- return me;
},
ensureScalesHaveIDs: function() {
@@ -3969,13 +4036,16 @@ module.exports = function(Chart) {
if (options.scales) {
items = items.concat(
(options.scales.xAxes || []).map(function(xAxisOptions) {
- return { options: xAxisOptions, dtype: 'category' }; }),
+ return {options: xAxisOptions, dtype: 'category'};
+ }),
(options.scales.yAxes || []).map(function(yAxisOptions) {
- return { options: yAxisOptions, dtype: 'linear' }; }));
+ return {options: yAxisOptions, dtype: 'linear'};
+ })
+ );
}
if (options.scale) {
- items.push({ options: options.scale, dtype: 'radialLinear', isDefault: true });
+ items.push({options: options.scale, dtype: 'radialLinear', isDefault: true});
}
helpers.each(items, function(item) {
@@ -4006,10 +4076,6 @@ module.exports = function(Chart) {
Chart.scaleService.addScalesToLayout(this);
},
- updateLayout: function() {
- Chart.layoutService.update(this, this.chart.width, this.chart.height);
- },
-
buildOrUpdateControllers: function() {
var me = this;
var types = [];
@@ -4043,6 +4109,10 @@ module.exports = function(Chart) {
return newControllers;
},
+ /**
+ * Reset the elements of all datasets
+ * @private
+ */
resetElements: function() {
var me = this;
helpers.each(me.data.datasets, function(dataset, datasetIndex) {
@@ -4050,9 +4120,22 @@ module.exports = function(Chart) {
}, me);
},
- update: function update(animationDuration, lazy) {
+ /**
+ * Resets the chart back to it's state before the initial animation
+ */
+ reset: function() {
+ this.resetElements();
+ this.tooltip.initialize();
+ },
+
+ update: function(animationDuration, lazy) {
var me = this;
- Chart.plugins.notify('beforeUpdate', [me]);
+
+ updateConfig(me);
+
+ if (plugins.notify(me, 'beforeUpdate') === false) {
+ return;
+ }
// In case the entire data object changed
me.tooltip._data = me.data;
@@ -4065,10 +4148,7 @@ module.exports = function(Chart) {
me.getDatasetMeta(datasetIndex).controller.buildOrUpdateElements();
}, me);
- Chart.layoutService.update(me, me.chart.width, me.chart.height);
-
- // Apply changes to the dataets that require the scales to have been calculated i.e BorderColor chages
- Chart.plugins.notify('afterScaleUpdate', [me]);
+ me.updateLayout();
// Can only reset the new controllers after the scales have been updated
helpers.each(newControllers, function(controller) {
@@ -4078,60 +4158,80 @@ module.exports = function(Chart) {
me.updateDatasets();
// Do this before render so that any plugins that need final scale updates can use it
- Chart.plugins.notify('afterUpdate', [me]);
+ plugins.notify(me, 'afterUpdate');
- me.render(animationDuration, lazy);
+ if (me._bufferedRender) {
+ me._bufferedRequest = {
+ lazy: lazy,
+ duration: animationDuration
+ };
+ } else {
+ me.render(animationDuration, lazy);
+ }
},
/**
- * @method beforeDatasetsUpdate
- * @description Called before all datasets are updated. If a plugin returns false,
- * the datasets update will be cancelled until another chart update is triggered.
- * @param {Object} instance the chart instance being updated.
- * @returns {Boolean} false to cancel the datasets update.
- * @memberof Chart.PluginBase
- * @since version 2.1.5
- * @instance
+ * Updates the chart layout unless a plugin returns `false` to the `beforeLayout`
+ * hook, in which case, plugins will not be called on `afterLayout`.
+ * @private
*/
+ updateLayout: function() {
+ var me = this;
- /**
- * @method afterDatasetsUpdate
- * @description Called after all datasets have been updated. Note that this
- * extension will not be called if the datasets update has been cancelled.
- * @param {Object} instance the chart instance being updated.
- * @memberof Chart.PluginBase
- * @since version 2.1.5
- * @instance
- */
+ if (plugins.notify(me, 'beforeLayout') === false) {
+ return;
+ }
- /**
- * Updates all datasets unless a plugin returns false to the beforeDatasetsUpdate
- * extension, in which case no datasets will be updated and the afterDatasetsUpdate
- * notification will be skipped.
- * @protected
- * @instance
+ Chart.layoutService.update(this, this.chart.width, this.chart.height);
+
+ /**
+ * Provided for backward compatibility, use `afterLayout` instead.
+ * @method IPlugin#afterScaleUpdate
+ * @deprecated since version 2.5.0
+ * @todo remove at version 3
+ */
+ plugins.notify(me, 'afterScaleUpdate');
+ plugins.notify(me, 'afterLayout');
+ },
+
+ /**
+ * Updates all datasets unless a plugin returns `false` to the `beforeDatasetsUpdate`
+ * hook, in which case, plugins will not be called on `afterDatasetsUpdate`.
+ * @private
*/
updateDatasets: function() {
var me = this;
- var i, ilen;
- if (Chart.plugins.notify('beforeDatasetsUpdate', [ me ])) {
- for (i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
- me.getDatasetMeta(i).controller.update();
- }
+ if (plugins.notify(me, 'beforeDatasetsUpdate') === false) {
+ return;
+ }
- Chart.plugins.notify('afterDatasetsUpdate', [ me ]);
+ for (var i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
+ me.getDatasetMeta(i).controller.update();
}
+
+ plugins.notify(me, 'afterDatasetsUpdate');
},
- render: function render(duration, lazy) {
+ render: function(duration, lazy) {
var me = this;
- Chart.plugins.notify('beforeRender', [me]);
+
+ if (plugins.notify(me, 'beforeRender') === false) {
+ return;
+ }
var animationOptions = me.options.animation;
+ var onComplete = function() {
+ plugins.notify(me, 'afterRender');
+ var callback = animationOptions && animationOptions.onComplete;
+ if (callback && callback.call) {
+ callback.call(me);
+ }
+ };
+
if (animationOptions && ((typeof duration !== 'undefined' && duration !== 0) || (typeof duration === 'undefined' && animationOptions.duration !== 0))) {
var animation = new Chart.Animation();
- animation.numSteps = (duration || animationOptions.duration) / 16.66; //60 fps
+ animation.numSteps = (duration || animationOptions.duration) / 16.66; // 60 fps
animation.easing = animationOptions.easing;
// render function
@@ -4145,172 +4245,94 @@ module.exports = function(Chart) {
// user events
animation.onAnimationProgress = animationOptions.onProgress;
- animation.onAnimationComplete = animationOptions.onComplete;
+ animation.onAnimationComplete = onComplete;
Chart.animationService.addAnimation(me, animation, duration, lazy);
} else {
me.draw();
- if (animationOptions && animationOptions.onComplete && animationOptions.onComplete.call) {
- animationOptions.onComplete.call(me);
- }
+ onComplete();
}
+
return me;
},
- draw: function(ease) {
+ draw: function(easingValue) {
var me = this;
- var easingDecimal = ease || 1;
+
me.clear();
- Chart.plugins.notify('beforeDraw', [me, easingDecimal]);
+ if (easingValue === undefined || easingValue === null) {
+ easingValue = 1;
+ }
+
+ if (plugins.notify(me, 'beforeDraw', [easingValue]) === false) {
+ return;
+ }
// Draw all the scales
helpers.each(me.boxes, function(box) {
box.draw(me.chartArea);
}, me);
+
if (me.scale) {
me.scale.draw();
}
- Chart.plugins.notify('beforeDatasetsDraw', [me, easingDecimal]);
+ me.drawDatasets(easingValue);
+
+ // Finally draw the tooltip
+ me.tooltip.transition(easingValue).draw();
+
+ plugins.notify(me, 'afterDraw', [easingValue]);
+ },
+
+ /**
+ * Draws all datasets unless a plugin returns `false` to the `beforeDatasetsDraw`
+ * hook, in which case, plugins will not be called on `afterDatasetsDraw`.
+ * @private
+ */
+ drawDatasets: function(easingValue) {
+ var me = this;
+
+ if (plugins.notify(me, 'beforeDatasetsDraw', [easingValue]) === false) {
+ return;
+ }
// Draw each dataset via its respective controller (reversed to support proper line stacking)
helpers.each(me.data.datasets, function(dataset, datasetIndex) {
if (me.isDatasetVisible(datasetIndex)) {
- me.getDatasetMeta(datasetIndex).controller.draw(ease);
+ me.getDatasetMeta(datasetIndex).controller.draw(easingValue);
}
}, me, true);
- Chart.plugins.notify('afterDatasetsDraw', [me, easingDecimal]);
-
- // Finally draw the tooltip
- me.tooltip.transition(easingDecimal).draw();
-
- Chart.plugins.notify('afterDraw', [me, easingDecimal]);
+ plugins.notify(me, 'afterDatasetsDraw', [easingValue]);
},
// Get the single element that was clicked on
// @return : An object containing the dataset index and element index of the matching element. Also contains the rectangle that was draw
getElementAtEvent: function(e) {
- var me = this;
- var eventPosition = helpers.getRelativePosition(e, me.chart);
- var elementsArray = [];
-
- helpers.each(me.data.datasets, function(dataset, datasetIndex) {
- if (me.isDatasetVisible(datasetIndex)) {
- var meta = me.getDatasetMeta(datasetIndex);
- helpers.each(meta.data, function(element) {
- if (element.inRange(eventPosition.x, eventPosition.y)) {
- elementsArray.push(element);
- return elementsArray;
- }
- });
- }
- });
-
- return elementsArray.slice(0, 1);
+ return Chart.Interaction.modes.single(this, e);
},
getElementsAtEvent: function(e) {
- var me = this;
- var eventPosition = helpers.getRelativePosition(e, me.chart);
- var elementsArray = [];
-
- var found = (function() {
- if (me.data.datasets) {
- for (var i = 0; i < me.data.datasets.length; i++) {
- var meta = me.getDatasetMeta(i);
- if (me.isDatasetVisible(i)) {
- for (var j = 0; j < meta.data.length; j++) {
- if (meta.data[j].inRange(eventPosition.x, eventPosition.y)) {
- return meta.data[j];
- }
- }
- }
- }
- }
- }).call(me);
-
- if (!found) {
- return elementsArray;
- }
-
- helpers.each(me.data.datasets, function(dataset, datasetIndex) {
- if (me.isDatasetVisible(datasetIndex)) {
- var meta = me.getDatasetMeta(datasetIndex),
- element = meta.data[found._index];
- if(element && !element._view.skip){
- elementsArray.push(element);
- }
- }
- }, me);
-
- return elementsArray;
+ return Chart.Interaction.modes.label(this, e, {intersect: true});
},
getElementsAtXAxis: function(e) {
- var me = this;
- var eventPosition = helpers.getRelativePosition(e, me.chart);
- var elementsArray = [];
-
- var found = (function() {
- if (me.data.datasets) {
- for (var i = 0; i < me.data.datasets.length; i++) {
- var meta = me.getDatasetMeta(i);
- if (me.isDatasetVisible(i)) {
- for (var j = 0; j < meta.data.length; j++) {
- if (meta.data[j].inLabelRange(eventPosition.x, eventPosition.y)) {
- return meta.data[j];
- }
- }
- }
- }
- }
- }).call(me);
+ return Chart.Interaction.modes['x-axis'](this, e, {intersect: true});
+ },
- if (!found) {
- return elementsArray;
+ getElementsAtEventForMode: function(e, mode, options) {
+ var method = Chart.Interaction.modes[mode];
+ if (typeof method === 'function') {
+ return method(this, e, options);
}
- helpers.each(me.data.datasets, function(dataset, datasetIndex) {
- if (me.isDatasetVisible(datasetIndex)) {
- var meta = me.getDatasetMeta(datasetIndex);
- var index = helpers.findIndex(meta.data, function (it) {
- return found._model.x === it._model.x;
- });
- if(index !== -1 && !meta.data[index]._view.skip) {
- elementsArray.push(meta.data[index]);
- }
- }
- }, me);
-
- return elementsArray;
- },
-
- getElementsAtEventForMode: function(e, mode) {
- var me = this;
- switch (mode) {
- case 'single':
- return me.getElementAtEvent(e);
- case 'label':
- return me.getElementsAtEvent(e);
- case 'dataset':
- return me.getDatasetAtEvent(e);
- case 'x-axis':
- return me.getElementsAtXAxis(e);
- default:
- return e;
- }
+ return [];
},
getDatasetAtEvent: function(e) {
- var elementsArray = this.getElementAtEvent(e);
-
- if (elementsArray.length > 0) {
- elementsArray = this.getDatasetMeta(elementsArray[0]._datasetIndex).data;
- }
-
- return elementsArray;
+ return Chart.Interaction.modes.dataset(this, e, {intersect: true});
},
getDatasetMeta: function(datasetIndex) {
@@ -4323,14 +4345,14 @@ module.exports = function(Chart) {
var meta = dataset._meta[me.id];
if (!meta) {
meta = dataset._meta[me.id] = {
- type: null,
- data: [],
- dataset: null,
- controller: null,
- hidden: null, // See isDatasetVisible() comment
- xAxisID: null,
- yAxisID: null
- };
+ type: null,
+ data: [],
+ dataset: null,
+ controller: null,
+ hidden: null, // See isDatasetVisible() comment
+ xAxisID: null,
+ yAxisID: null
+ };
}
return meta;
@@ -4339,7 +4361,7 @@ module.exports = function(Chart) {
getVisibleDatasetCount: function() {
var count = 0;
for (var i = 0, ilen = this.data.datasets.length; i<ilen; ++i) {
- if (this.isDatasetVisible(i)) {
+ if (this.isDatasetVisible(i)) {
count++;
}
}
@@ -4360,26 +4382,29 @@ module.exports = function(Chart) {
destroy: function() {
var me = this;
- me.stop();
- me.clear();
- helpers.unbindEvents(me, me.events);
- helpers.removeResizeListener(me.chart.canvas.parentNode);
-
- // Reset canvas height/width attributes
var canvas = me.chart.canvas;
- canvas.width = me.chart.width;
- canvas.height = me.chart.height;
+ var meta, i, ilen;
+
+ me.stop();
- // if we scaled the canvas in response to a devicePixelRatio !== 1, we need to undo that transform here
- if (me.chart.originalDevicePixelRatio !== undefined) {
- me.chart.ctx.scale(1 / me.chart.originalDevicePixelRatio, 1 / me.chart.originalDevicePixelRatio);
+ // dataset controllers need to cleanup associated data
+ for (i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
+ meta = me.getDatasetMeta(i);
+ if (meta.controller) {
+ meta.controller.destroy();
+ meta.controller = null;
+ }
}
- // Reset to the old style since it may have been changed by the device pixel ratio changes
- canvas.style.width = me.chart.originalCanvasStyleWidth;
- canvas.style.height = me.chart.originalCanvasStyleHeight;
+ if (canvas) {
+ me.unbindEvents();
+ helpers.clear(me.chart);
+ platform.releaseContext(me.chart.ctx);
+ me.chart.canvas = null;
+ me.chart.ctx = null;
+ }
- Chart.plugins.notify('destroy', [me]);
+ plugins.notify(me, 'destroy');
delete Chart.instances[me.id];
},
@@ -4396,12 +4421,51 @@ module.exports = function(Chart) {
_data: me.data,
_options: me.options.tooltips
}, me);
+ me.tooltip.initialize();
},
+ /**
+ * @private
+ */
bindEvents: function() {
var me = this;
- helpers.bindEvents(me, me.options.events, function(evt) {
- me.eventHandler(evt);
+ var listeners = me._listeners = {};
+ var listener = function() {
+ me.eventHandler.apply(me, arguments);
+ };
+
+ helpers.each(me.options.events, function(type) {
+ platform.addEventListener(me, type, listener);
+ listeners[type] = listener;
+ });
+
+ // Responsiveness is currently based on the use of an iframe, however this method causes
+ // performance issues and could be troublesome when used with ad blockers. So make sure
+ // that the user is still able to create a chart without iframe when responsive is false.
+ // See https://github.com/chartjs/Chart.js/issues/2210
+ if (me.options.responsive) {
+ listener = function() {
+ me.resize();
+ };
+
+ platform.addEventListener(me, 'resize', listener);
+ listeners.resize = listener;
+ }
+ },
+
+ /**
+ * @private
+ */
+ unbindEvents: function() {
+ var me = this;
+ var listeners = me._listeners;
+ if (!listeners) {
+ return;
+ }
+
+ delete me._listeners;
+ helpers.each(listeners, function(listener, type) {
+ platform.removeEventListener(me, type, listener);
});
},
@@ -4409,20 +4473,6 @@ module.exports = function(Chart) {
var method = enabled? 'setHoverStyle' : 'removeHoverStyle';
var element, i, ilen;
- switch (mode) {
- case 'single':
- elements = [ elements[0] ];
- break;
- case 'label':
- case 'dataset':
- case 'x-axis':
- // elements = elements;
- break;
- default:
- // unsupported mode
- return;
- }
-
for (i=0, ilen=elements.length; i<ilen; ++i) {
element = elements[i];
if (element) {
@@ -4431,36 +4481,76 @@ module.exports = function(Chart) {
}
},
- eventHandler: function eventHandler(e) {
+ /**
+ * @private
+ */
+ eventHandler: function(e) {
var me = this;
var tooltip = me.tooltip;
+
+ if (plugins.notify(me, 'beforeEvent', [e]) === false) {
+ return;
+ }
+
+ // Buffer any update calls so that renders do not occur
+ me._bufferedRender = true;
+ me._bufferedRequest = null;
+
+ var changed = me.handleEvent(e);
+ changed |= tooltip && tooltip.handleEvent(e);
+
+ plugins.notify(me, 'afterEvent', [e]);
+
+ var bufferedRequest = me._bufferedRequest;
+ if (bufferedRequest) {
+ // If we have an update that was triggered, we need to do a normal render
+ me.render(bufferedRequest.duration, bufferedRequest.lazy);
+ } else if (changed && !me.animating) {
+ // If entering, leaving, or changing elements, animate the change via pivot
+ me.stop();
+
+ // We only need to render at this point. Updating will cause scales to be
+ // recomputed generating flicker & using more memory than necessary.
+ me.render(me.options.hover.animationDuration, true);
+ }
+
+ me._bufferedRender = false;
+ me._bufferedRequest = null;
+
+ return me;
+ },
+
+ /**
+ * Handle an event
+ * @private
+ * @param {IEvent} event the event to handle
+ * @return {Boolean} true if the chart needs to re-render
+ */
+ handleEvent: function(e) {
+ var me = this;
var options = me.options || {};
var hoverOptions = options.hover;
- var tooltipsOptions = options.tooltips;
+ var changed = false;
me.lastActive = me.lastActive || [];
- me.lastTooltipActive = me.lastTooltipActive || [];
// Find Active Elements for hover and tooltips
if (e.type === 'mouseout') {
me.active = [];
- me.tooltipActive = [];
} else {
- me.active = me.getElementsAtEventForMode(e, hoverOptions.mode);
- me.tooltipActive = me.getElementsAtEventForMode(e, tooltipsOptions.mode);
+ me.active = me.getElementsAtEventForMode(e, hoverOptions.mode, hoverOptions);
}
// On Hover hook
if (hoverOptions.onHover) {
- hoverOptions.onHover.call(me, me.active);
+ // Need to call with native event here to not break backwards compatibility
+ hoverOptions.onHover.call(me, e.native, me.active);
}
if (e.type === 'mouseup' || e.type === 'click') {
if (options.onClick) {
- options.onClick.call(me, e, me.active);
- }
- if (me.legend && me.legend.handleEvent) {
- me.legend.handleEvent(e);
+ // Use e.native here for backwards compatibility
+ options.onClick.call(me, e.native, me.active);
}
}
@@ -4474,52 +4564,97 @@ module.exports = function(Chart) {
me.updateHoverStyle(me.active, hoverOptions.mode, true);
}
- // Built in Tooltips
- if (tooltipsOptions.enabled || tooltipsOptions.custom) {
- tooltip.initialize();
- tooltip._active = me.tooltipActive;
- tooltip.update(true);
- }
-
- // Hover animations
- tooltip.pivot();
-
- if (!me.animating) {
- // If entering, leaving, or changing elements, animate the change via pivot
- if (!helpers.arrayEquals(me.active, me.lastActive) ||
- !helpers.arrayEquals(me.tooltipActive, me.lastTooltipActive)) {
-
- me.stop();
-
- if (tooltipsOptions.enabled || tooltipsOptions.custom) {
- tooltip.update(true);
- }
-
- // We only need to render at this point. Updating will cause scales to be
- // recomputed generating flicker & using more memory than necessary.
- me.render(hoverOptions.animationDuration, true);
- }
- }
+ changed = !helpers.arrayEquals(me.active, me.lastActive);
// Remember Last Actives
me.lastActive = me.active;
- me.lastTooltipActive = me.tooltipActive;
- return me;
+
+ return changed;
}
});
};
},{}],24:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
var helpers = Chart.helpers;
- var noop = helpers.noop;
+
+ var arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
+
+ /**
+ * Hooks the array methods that add or remove values ('push', pop', 'shift', 'splice',
+ * 'unshift') and notify the listener AFTER the array has been altered. Listeners are
+ * called on the 'onData*' callbacks (e.g. onDataPush, etc.) with same arguments.
+ */
+ function listenArrayEvents(array, listener) {
+ if (array._chartjs) {
+ array._chartjs.listeners.push(listener);
+ return;
+ }
+
+ Object.defineProperty(array, '_chartjs', {
+ configurable: true,
+ enumerable: false,
+ value: {
+ listeners: [listener]
+ }
+ });
+
+ arrayEvents.forEach(function(key) {
+ var method = 'onData' + key.charAt(0).toUpperCase() + key.slice(1);
+ var base = array[key];
+
+ Object.defineProperty(array, key, {
+ configurable: true,
+ enumerable: false,
+ value: function() {
+ var args = Array.prototype.slice.call(arguments);
+ var res = base.apply(this, args);
+
+ helpers.each(array._chartjs.listeners, function(object) {
+ if (typeof object[method] === 'function') {
+ object[method].apply(object, args);
+ }
+ });
+
+ return res;
+ }
+ });
+ });
+ }
+
+ /**
+ * Removes the given array event listener and cleanup extra attached properties (such as
+ * the _chartjs stub and overridden methods) if array doesn't have any more listeners.
+ */
+ function unlistenArrayEvents(array, listener) {
+ var stub = array._chartjs;
+ if (!stub) {
+ return;
+ }
+
+ var listeners = stub.listeners;
+ var index = listeners.indexOf(listener);
+ if (index !== -1) {
+ listeners.splice(index, 1);
+ }
+
+ if (listeners.length > 0) {
+ return;
+ }
+
+ arrayEvents.forEach(function(key) {
+ delete array[key];
+ });
+
+ delete array._chartjs;
+ }
// Base class for all dataset controllers (line, bar, etc)
Chart.DatasetController = function(chart, datasetIndex) {
- this.initialize.call(this, chart, datasetIndex);
+ this.initialize(chart, datasetIndex);
};
helpers.extend(Chart.DatasetController.prototype, {
@@ -4577,6 +4712,15 @@ module.exports = function(Chart) {
this.update(true);
},
+ /**
+ * @private
+ */
+ destroy: function() {
+ if (this._data) {
+ unlistenArrayEvents(this._data, this);
+ }
+ },
+
createMetaDataset: function() {
var me = this;
var type = me.datasetElementType;
@@ -4604,45 +4748,50 @@ module.exports = function(Chart) {
var i, ilen;
for (i=0, ilen=data.length; i<ilen; ++i) {
- metaData[i] = metaData[i] || me.createMetaData(meta, i);
+ metaData[i] = metaData[i] || me.createMetaData(i);
}
meta.dataset = meta.dataset || me.createMetaDataset();
},
addElementAndReset: function(index) {
- var me = this;
- var element = me.createMetaData(index);
- me.getMeta().data.splice(index, 0, element);
- me.updateElement(element, index, true);
+ var element = this.createMetaData(index);
+ this.getMeta().data.splice(index, 0, element);
+ this.updateElement(element, index, true);
},
buildOrUpdateElements: function() {
- // Handle the number of data points changing
- var meta = this.getMeta(),
- md = meta.data,
- numData = this.getDataset().data.length,
- numMetaData = md.length;
+ var me = this;
+ var dataset = me.getDataset();
+ var data = dataset.data || (dataset.data = []);
- // Make sure that we handle number of datapoints changing
- if (numData < numMetaData) {
- // Remove excess bars for data points that have been removed
- md.splice(numData, numMetaData - numData);
- } else if (numData > numMetaData) {
- // Add new elements
- for (var index = numMetaData; index < numData; ++index) {
- this.addElementAndReset(index);
+ // In order to correctly handle data addition/deletion animation (an thus simulate
+ // real-time charts), we need to monitor these data modifications and synchronize
+ // the internal meta data accordingly.
+ if (me._data !== data) {
+ if (me._data) {
+ // This case happens when the user replaced the data array instance.
+ unlistenArrayEvents(me._data, me);
}
+
+ listenArrayEvents(data, me);
+ me._data = data;
}
+
+ // Re-sync meta data in case the user replaced the data array or if we missed
+ // any updates and so make sure that we handle number of datapoints changing.
+ me.resyncElements();
},
- update: noop,
+ update: helpers.noop,
draw: function(ease) {
var easingDecimal = ease || 1;
- helpers.each(this.getMeta().data, function(element) {
- element.transition(easingDecimal).draw();
- });
+ var i, len;
+ var metaData = this.getMeta().data;
+ for (i = 0, len = metaData.length; i < len; ++i) {
+ metaData[i].transition(easingDecimal).draw();
+ }
},
removeHoverStyle: function(element, elementOpts) {
@@ -4668,133 +4817,186 @@ module.exports = function(Chart) {
model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : valueOrDefault(dataset.hoverBackgroundColor, index, getHoverColor(model.backgroundColor));
model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : valueOrDefault(dataset.hoverBorderColor, index, getHoverColor(model.borderColor));
model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : valueOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
+ },
+
+ /**
+ * @private
+ */
+ resyncElements: function() {
+ var me = this;
+ var meta = me.getMeta();
+ var data = me.getDataset().data;
+ var numMeta = meta.data.length;
+ var numData = data.length;
+
+ if (numData < numMeta) {
+ meta.data.splice(numData, numMeta - numData);
+ } else if (numData > numMeta) {
+ me.insertElements(numMeta, numData - numMeta);
+ }
+ },
+
+ /**
+ * @private
+ */
+ insertElements: function(start, count) {
+ for (var i=0; i<count; ++i) {
+ this.addElementAndReset(start + i);
+ }
+ },
+
+ /**
+ * @private
+ */
+ onDataPush: function() {
+ this.insertElements(this.getDataset().data.length-1, arguments.length);
+ },
+
+ /**
+ * @private
+ */
+ onDataPop: function() {
+ this.getMeta().data.pop();
+ },
+
+ /**
+ * @private
+ */
+ onDataShift: function() {
+ this.getMeta().data.shift();
+ },
+
+ /**
+ * @private
+ */
+ onDataSplice: function(start, count) {
+ this.getMeta().data.splice(start, count);
+ this.insertElements(start, arguments.length - 2);
+ },
+
+ /**
+ * @private
+ */
+ onDataUnshift: function() {
+ this.insertElements(0, arguments.length);
}
-
- });
-
+ });
Chart.DatasetController.extend = helpers.inherits;
};
+
},{}],25:[function(require,module,exports){
-"use strict";
+'use strict';
module.exports = function(Chart) {
- var helpers = Chart.helpers;
-
- Chart.elements = {};
+ var helpers = Chart.helpers;
- Chart.Element = function(configuration) {
- helpers.extend(this, configuration);
- this.initialize.apply(this, arguments);
- };
+ Chart.elements = {};
- helpers.extend(Chart.Element.prototype, {
+ Chart.Element = function(configuration) {
+ helpers.extend(this, configuration);
+ this.initialize.apply(this, arguments);
+ };
- initialize: function() {
- this.hidden = false;
- },
+ helpers.extend(Chart.Element.prototype, {
- pivot: function() {
- var me = this;
- if (!me._view) {
- me._view = helpers.clone(me._model);
- }
- me._start = helpers.clone(me._view);
- return me;
- },
+ initialize: function() {
+ this.hidden = false;
+ },
- transition: function(ease) {
- var me = this;
-
- if (!me._view) {
- me._view = helpers.clone(me._model);
- }
-
- // No animation -> No Transition
- if (ease === 1) {
- me._view = me._model;
- me._start = null;
- return me;
- }
-
- if (!me._start) {
- me.pivot();
- }
-
- helpers.each(me._model, function(value, key) {
-
- if (key[0] === '_') {
- // Only non-underscored properties
- }
-
- // Init if doesn't exist
- else if (!me._view.hasOwnProperty(key)) {
- if (typeof value === 'number' && !isNaN(me._view[key])) {
- me._view[key] = value * ease;
- } else {
- me._view[key] = value;
- }
- }
-
- // No unnecessary computations
- else if (value === me._view[key]) {
- // It's the same! Woohoo!
- }
-
- // Color transitions if possible
- else if (typeof value === 'string') {
- try {
- var color = helpers.color(me._model[key]).mix(helpers.color(me._start[key]), ease);
- me._view[key] = color.rgbString();
- } catch (err) {
- me._view[key] = value;
- }
- }
- // Number transitions
- else if (typeof value === 'number') {
- var startVal = me._start[key] !== undefined && isNaN(me._start[key]) === false ? me._start[key] : 0;
- me._view[key] = ((me._model[key] - startVal) * ease) + startVal;
- }
- // Everything else
- else {
- me._view[key] = value;
- }
- }, me);
-
- return me;
- },
-
- tooltipPosition: function() {
- return {
- x: this._model.x,
- y: this._model.y
- };
- },
-
- hasValue: function() {
- return helpers.isNumber(this._model.x) && helpers.isNumber(this._model.y);
- }
- });
+ pivot: function() {
+ var me = this;
+ if (!me._view) {
+ me._view = helpers.clone(me._model);
+ }
+ me._start = helpers.clone(me._view);
+ return me;
+ },
- Chart.Element.extend = helpers.inherits;
+ transition: function(ease) {
+ var me = this;
-};
+ if (!me._view) {
+ me._view = helpers.clone(me._model);
+ }
-},{}],26:[function(require,module,exports){
-/*global window: false */
-/*global document: false */
-"use strict";
+ // No animation -> No Transition
+ if (ease === 1) {
+ me._view = me._model;
+ me._start = null;
+ return me;
+ }
-var color = require(3);
+ if (!me._start) {
+ me.pivot();
+ }
-module.exports = function(Chart) {
- //Global Chart helpers object for utility methods and classes
- var helpers = Chart.helpers = {};
+ helpers.each(me._model, function(value, key) {
- //-- Basic js utility methods
- helpers.each = function(loopable, callback, self, reverse) {
- // Check to see if null or undefined firstly.
+ if (key[0] === '_') {
+ // Only non-underscored properties
+ // Init if doesn't exist
+ } else if (!me._view.hasOwnProperty(key)) {
+ if (typeof value === 'number' && !isNaN(me._view[key])) {
+ me._view[key] = value * ease;
+ } else {
+ me._view[key] = value;
+ }
+ // No unnecessary computations
+ } else if (value === me._view[key]) {
+ // It's the same! Woohoo!
+ // Color transitions if possible
+ } else if (typeof value === 'string') {
+ try {
+ var color = helpers.color(me._model[key]).mix(helpers.color(me._start[key]), ease);
+ me._view[key] = color.rgbString();
+ } catch (err) {
+ me._view[key] = value;
+ }
+ // Number transitions
+ } else if (typeof value === 'number') {
+ var startVal = me._start[key] !== undefined && isNaN(me._start[key]) === false ? me._start[key] : 0;
+ me._view[key] = ((me._model[key] - startVal) * ease) + startVal;
+ // Everything else
+ } else {
+ me._view[key] = value;
+ }
+ }, me);
+
+ return me;
+ },
+
+ tooltipPosition: function() {
+ return {
+ x: this._model.x,
+ y: this._model.y
+ };
+ },
+
+ hasValue: function() {
+ return helpers.isNumber(this._model.x) && helpers.isNumber(this._model.y);
+ }
+ });
+
+ Chart.Element.extend = helpers.inherits;
+
+};
+
+},{}],26:[function(require,module,exports){
+/* global window: false */
+/* global document: false */
+'use strict';
+
+var color = require(3);
+
+module.exports = function(Chart) {
+ // Global Chart helpers object for utility methods and classes
+ var helpers = Chart.helpers = {};
+
+ // -- Basic js utility methods
+ helpers.each = function(loopable, callback, self, reverse) {
+ // Check to see if null or undefined firstly.
var i, len;
if (helpers.isArray(loopable)) {
len = loopable.length;
@@ -4829,7 +5031,9 @@ module.exports = function(Chart) {
return objClone;
};
helpers.extend = function(base) {
- var setFn = function(value, key) { base[key] = value; };
+ var setFn = function(value, key) {
+ base[key] = value;
+ };
for (var i = 1, ilen = arguments.length; i < ilen; i++) {
helpers.each(arguments[i], setFn);
}
@@ -4840,37 +5044,23 @@ module.exports = function(Chart) {
var base = helpers.clone(_base);
helpers.each(Array.prototype.slice.call(arguments, 1), function(extension) {
helpers.each(extension, function(value, key) {
- if (key === 'scales') {
- // Scale config merging is complex. Add out own function here for that
- base[key] = helpers.scaleMerge(base.hasOwnProperty(key) ? base[key] : {}, value);
+ var baseHasProperty = base.hasOwnProperty(key);
+ var baseVal = baseHasProperty ? base[key] : {};
+ if (key === 'scales') {
+ // Scale config merging is complex. Add our own function here for that
+ base[key] = helpers.scaleMerge(baseVal, value);
} else if (key === 'scale') {
// Used in polar area & radar charts since there is only one scale
- base[key] = helpers.configMerge(base.hasOwnProperty(key) ? base[key] : {}, Chart.scaleService.getScaleDefaults(value.type), value);
- } else if (base.hasOwnProperty(key) && helpers.isArray(base[key]) && helpers.isArray(value)) {
- // In this case we have an array of objects replacing another array. Rather than doing a strict replace,
- // merge. This allows easy scale option merging
- var baseArray = base[key];
-
- helpers.each(value, function(valueObj, index) {
-
- if (index < baseArray.length) {
- if (typeof baseArray[index] === 'object' && baseArray[index] !== null && typeof valueObj === 'object' && valueObj !== null) {
- // Two objects are coming together. Do a merge of them.
- baseArray[index] = helpers.configMerge(baseArray[index], valueObj);
- } else {
- // Just overwrite in this case since there is nothing to merge
- baseArray[index] = valueObj;
- }
- } else {
- baseArray.push(valueObj); // nothing to merge
- }
- });
-
- } else if (base.hasOwnProperty(key) && typeof base[key] === "object" && base[key] !== null && typeof value === "object") {
+ base[key] = helpers.configMerge(baseVal, Chart.scaleService.getScaleDefaults(value.type), value);
+ } else if (baseHasProperty
+ && typeof baseVal === 'object'
+ && !helpers.isArray(baseVal)
+ && baseVal !== null
+ && typeof value === 'object'
+ && !helpers.isArray(value)) {
// If we are overwriting an object with an object, do a merge of the properties.
- base[key] = helpers.configMerge(base[key], value);
-
+ base[key] = helpers.configMerge(baseVal, value);
} else {
// can just overwrite the value in this case
base[key] = value;
@@ -4907,7 +5097,7 @@ module.exports = function(Chart) {
base[key].push(helpers.configMerge(Chart.scaleService.getScaleDefaults(axisType), valueObj));
});
}
- } else if (base.hasOwnProperty(key) && typeof base[key] === "object" && base[key] !== null && typeof value === "object") {
+ } else if (base.hasOwnProperty(key) && typeof base[key] === 'object' && base[key] !== null && typeof value === 'object') {
// If we are overwriting an object with an object, do a merge of the properties.
base[key] = helpers.configMerge(base[key], value);
@@ -4934,7 +5124,9 @@ module.exports = function(Chart) {
return value === undefined ? defaultValue : value;
};
helpers.indexOf = Array.prototype.indexOf?
- function(array, item) { return array.indexOf(item); } :
+ function(array, item) {
+ return array.indexOf(item);
+ }:
function(array, item) {
for (var i = 0, ilen = array.length; i < ilen; ++i) {
if (array[i] === item) {
@@ -4946,20 +5138,21 @@ module.exports = function(Chart) {
helpers.where = function(collection, filterCallback) {
if (helpers.isArray(collection) && Array.prototype.filter) {
return collection.filter(filterCallback);
- } else {
- var filtered = [];
+ }
+ var filtered = [];
- helpers.each(collection, function(item) {
- if (filterCallback(item)) {
- filtered.push(item);
- }
- });
+ helpers.each(collection, function(item) {
+ if (filterCallback(item)) {
+ filtered.push(item);
+ }
+ });
- return filtered;
- }
+ return filtered;
};
helpers.findIndex = Array.prototype.findIndex?
- function(array, callback, scope) { return array.findIndex(callback, scope); } :
+ function(array, callback, scope) {
+ return array.findIndex(callback, scope);
+ } :
function(array, callback, scope) {
scope = scope === undefined? array : scope;
for (var i = 0, ilen = array.length; i < ilen; ++i) {
@@ -4994,16 +5187,16 @@ module.exports = function(Chart) {
}
};
helpers.inherits = function(extensions) {
- //Basic javascript inheritance based on the model created in Backbone.js
- var parent = this;
- var ChartElement = (extensions && extensions.hasOwnProperty("constructor")) ? extensions.constructor : function() {
- return parent.apply(this, arguments);
+ // Basic javascript inheritance based on the model created in Backbone.js
+ var me = this;
+ var ChartElement = (extensions && extensions.hasOwnProperty('constructor')) ? extensions.constructor : function() {
+ return me.apply(this, arguments);
};
var Surrogate = function() {
this.constructor = ChartElement;
};
- Surrogate.prototype = parent.prototype;
+ Surrogate.prototype = me.prototype;
ChartElement.prototype = new Surrogate();
ChartElement.extend = helpers.inherits;
@@ -5012,7 +5205,7 @@ module.exports = function(Chart) {
helpers.extend(ChartElement.prototype, extensions);
}
- ChartElement.__super__ = parent.prototype;
+ ChartElement.__super__ = me.prototype;
return ChartElement;
};
@@ -5022,34 +5215,38 @@ module.exports = function(Chart) {
return function() {
return id++;
};
- })();
- //-- Math methods
+ }());
+ // -- Math methods
helpers.isNumber = function(n) {
return !isNaN(parseFloat(n)) && isFinite(n);
};
helpers.almostEquals = function(x, y, epsilon) {
return Math.abs(x - y) < epsilon;
};
+ helpers.almostWhole = function(x, epsilon) {
+ var rounded = Math.round(x);
+ return (((rounded - epsilon) < x) && ((rounded + epsilon) > x));
+ };
helpers.max = function(array) {
return array.reduce(function(max, value) {
if (!isNaN(value)) {
return Math.max(max, value);
- } else {
- return max;
}
+ return max;
}, Number.NEGATIVE_INFINITY);
};
helpers.min = function(array) {
return array.reduce(function(min, value) {
if (!isNaN(value)) {
return Math.min(min, value);
- } else {
- return min;
}
+ return min;
}, Number.POSITIVE_INFINITY);
};
helpers.sign = Math.sign?
- function(x) { return Math.sign(x); } :
+ function(x) {
+ return Math.sign(x);
+ } :
function(x) {
x = +x; // convert to a number
if (x === 0 || isNaN(x)) {
@@ -5058,7 +5255,9 @@ module.exports = function(Chart) {
return x > 0 ? 1 : -1;
};
helpers.log10 = Math.log10?
- function(x) { return Math.log10(x); } :
+ function(x) {
+ return Math.log10(x);
+ } :
function(x) {
return Math.log(x) / Math.LN10;
};
@@ -5085,12 +5284,15 @@ module.exports = function(Chart) {
distance: radialDistanceFromCenter
};
};
+ helpers.distanceBetweenPoints = function(pt1, pt2) {
+ return Math.sqrt(Math.pow(pt2.x - pt1.x, 2) + Math.pow(pt2.y - pt1.y, 2));
+ };
helpers.aliasPixel = function(pixelWidth) {
return (pixelWidth % 2 === 0) ? 0 : 0.5;
};
helpers.splineCurve = function(firstPoint, middlePoint, afterPoint, t) {
- //Props to Rob Spencer at scaled innovation for his post on splining between points
- //http://scaledinnovation.com/analytics/splines/aboutSplines.html
+ // Props to Rob Spencer at scaled innovation for his post on splining between points
+ // http://scaledinnovation.com/analytics/splines/aboutSplines.html
// This function must also respect "skipped" points
@@ -5142,16 +5344,28 @@ module.exports = function(Chart) {
var i, pointBefore, pointCurrent, pointAfter;
for (i = 0; i < pointsLen; ++i) {
pointCurrent = pointsWithTangents[i];
- if (pointCurrent.model.skip) continue;
+ if (pointCurrent.model.skip) {
+ continue;
+ }
+
pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
if (pointAfter && !pointAfter.model.skip) {
- pointCurrent.deltaK = (pointAfter.model.y - pointCurrent.model.y) / (pointAfter.model.x - pointCurrent.model.x);
+ var slopeDeltaX = (pointAfter.model.x - pointCurrent.model.x);
+
+ // In the case of two points that appear at the same x pixel, slopeDeltaX is 0
+ pointCurrent.deltaK = slopeDeltaX !== 0 ? (pointAfter.model.y - pointCurrent.model.y) / slopeDeltaX : 0;
+ }
+
+ if (!pointBefore || pointBefore.model.skip) {
+ pointCurrent.mK = pointCurrent.deltaK;
+ } else if (!pointAfter || pointAfter.model.skip) {
+ pointCurrent.mK = pointBefore.deltaK;
+ } else if (this.sign(pointBefore.deltaK) !== this.sign(pointCurrent.deltaK)) {
+ pointCurrent.mK = 0;
+ } else {
+ pointCurrent.mK = (pointBefore.deltaK + pointCurrent.deltaK) / 2;
}
- if (!pointBefore || pointBefore.model.skip) pointCurrent.mK = pointCurrent.deltaK;
- else if (!pointAfter || pointAfter.model.skip) pointCurrent.mK = pointBefore.deltaK;
- else if (this.sign(pointBefore.deltaK) != this.sign(pointCurrent.deltaK)) pointCurrent.mK = 0;
- else pointCurrent.mK = (pointBefore.deltaK + pointCurrent.deltaK) / 2;
}
// Adjust tangents to ensure monotonic properties
@@ -5159,26 +5373,35 @@ module.exports = function(Chart) {
for (i = 0; i < pointsLen - 1; ++i) {
pointCurrent = pointsWithTangents[i];
pointAfter = pointsWithTangents[i + 1];
- if (pointCurrent.model.skip || pointAfter.model.skip) continue;
- if (helpers.almostEquals(pointCurrent.deltaK, 0, this.EPSILON))
- {
+ if (pointCurrent.model.skip || pointAfter.model.skip) {
+ continue;
+ }
+
+ if (helpers.almostEquals(pointCurrent.deltaK, 0, this.EPSILON)) {
pointCurrent.mK = pointAfter.mK = 0;
continue;
}
+
alphaK = pointCurrent.mK / pointCurrent.deltaK;
betaK = pointAfter.mK / pointCurrent.deltaK;
squaredMagnitude = Math.pow(alphaK, 2) + Math.pow(betaK, 2);
- if (squaredMagnitude <= 9) continue;
+ if (squaredMagnitude <= 9) {
+ continue;
+ }
+
tauK = 3 / Math.sqrt(squaredMagnitude);
pointCurrent.mK = alphaK * tauK * pointCurrent.deltaK;
- pointAfter.mK = betaK * tauK * pointCurrent.deltaK;
+ pointAfter.mK = betaK * tauK * pointCurrent.deltaK;
}
// Compute control points
var deltaX;
for (i = 0; i < pointsLen; ++i) {
pointCurrent = pointsWithTangents[i];
- if (pointCurrent.model.skip) continue;
+ if (pointCurrent.model.skip) {
+ continue;
+ }
+
pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
if (pointBefore && !pointBefore.model.skip) {
@@ -5197,7 +5420,6 @@ module.exports = function(Chart) {
if (loop) {
return index >= collection.length - 1 ? collection[0] : collection[index + 1];
}
-
return index >= collection.length - 1 ? collection[collection.length - 1] : collection[index + 1];
};
helpers.previousItem = function(collection, index, loop) {
@@ -5222,22 +5444,20 @@ module.exports = function(Chart) {
} else {
niceFraction = 10;
}
+ } else if (fraction <= 1.0) {
+ niceFraction = 1;
+ } else if (fraction <= 2) {
+ niceFraction = 2;
+ } else if (fraction <= 5) {
+ niceFraction = 5;
} else {
- if (fraction <= 1.0) {
- niceFraction = 1;
- } else if (fraction <= 2) {
- niceFraction = 2;
- } else if (fraction <= 5) {
- niceFraction = 5;
- } else {
- niceFraction = 10;
- }
+ niceFraction = 10;
}
return niceFraction * Math.pow(10, exponent);
};
- //Easing functions adapted from Robert Penner's easing equations
- //http://www.robertpenner.com/easing/
+ // Easing functions adapted from Robert Penner's easing equations
+ // http://www.robertpenner.com/easing/
var easingEffects = helpers.easingEffects = {
linear: function(t) {
return t;
@@ -5423,9 +5643,8 @@ module.exports = function(Chart) {
return 1 * (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75);
} else if (t < (2.5 / 2.75)) {
return 1 * (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375);
- } else {
- return 1 * (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375);
}
+ return 1 * (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375);
},
easeInOutBounce: function(t) {
if (t < 1 / 2) {
@@ -5434,7 +5653,7 @@ module.exports = function(Chart) {
return easingEffects.easeOutBounce(t * 2 - 1) * 0.5 + 1 * 0.5;
}
};
- //Request animation polyfill - http://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
+ // Request animation polyfill - http://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
helpers.requestAnimFrame = (function() {
return window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
@@ -5444,18 +5663,8 @@ module.exports = function(Chart) {
function(callback) {
return window.setTimeout(callback, 1000 / 60);
};
- })();
- helpers.cancelAnimFrame = (function() {
- return window.cancelAnimationFrame ||
- window.webkitCancelAnimationFrame ||
- window.mozCancelAnimationFrame ||
- window.oCancelAnimationFrame ||
- window.msCancelAnimationFrame ||
- function(callback) {
- return window.clearTimeout(callback, 1000 / 60);
- };
- })();
- //-- DOM methods
+ }());
+ // -- DOM methods
helpers.getRelativePosition = function(evt, chart) {
var mouseX, mouseY;
var e = evt.originalEvent || evt,
@@ -5497,37 +5706,20 @@ module.exports = function(Chart) {
if (node.addEventListener) {
node.addEventListener(eventType, method);
} else if (node.attachEvent) {
- node.attachEvent("on" + eventType, method);
+ node.attachEvent('on' + eventType, method);
} else {
- node["on" + eventType] = method;
+ node['on' + eventType] = method;
}
};
helpers.removeEvent = function(node, eventType, handler) {
if (node.removeEventListener) {
node.removeEventListener(eventType, handler, false);
} else if (node.detachEvent) {
- node.detachEvent("on" + eventType, handler);
+ node.detachEvent('on' + eventType, handler);
} else {
- node["on" + eventType] = helpers.noop;
+ node['on' + eventType] = helpers.noop;
}
};
- helpers.bindEvents = function(chartInstance, arrayOfEvents, handler) {
- // Create the events object if it's not already present
- var events = chartInstance.events = chartInstance.events || {};
-
- helpers.each(arrayOfEvents, function(eventName) {
- events[eventName] = function() {
- handler.apply(chartInstance, arguments);
- };
- helpers.addEvent(chartInstance.chart.canvas, eventName, events[eventName]);
- });
- };
- helpers.unbindEvents = function(chartInstance, arrayOfEvents) {
- var canvas = chartInstance.chart.canvas;
- helpers.each(arrayOfEvents, function(handler, eventName) {
- helpers.removeEvent(canvas, eventName, handler);
- });
- };
// Private helper function to convert max-width/max-height values that may be percentages into a number
function parseMaxStyle(styleValue, node, parentProperty) {
@@ -5535,7 +5727,7 @@ module.exports = function(Chart) {
if (typeof(styleValue) === 'string') {
valueInPixels = parseInt(styleValue, 10);
- if (styleValue.indexOf('%') != -1) {
+ if (styleValue.indexOf('%') !== -1) {
// percentage * size in dimension
valueInPixels = valueInPixels / 100 * node.parentNode[parentProperty];
}
@@ -5551,7 +5743,7 @@ module.exports = function(Chart) {
* @private
*/
function isConstrainedValue(value) {
- return value !== undefined && value !== null && value !== 'none';
+ return value !== undefined && value !== null && value !== 'none';
}
// Private helper to get a constraint dimension
@@ -5586,15 +5778,17 @@ module.exports = function(Chart) {
};
helpers.getMaximumWidth = function(domNode) {
var container = domNode.parentNode;
- var padding = parseInt(helpers.getStyle(container, 'padding-left')) + parseInt(helpers.getStyle(container, 'padding-right'));
- var w = container.clientWidth - padding;
+ var paddingLeft = parseInt(helpers.getStyle(container, 'padding-left'), 10);
+ var paddingRight = parseInt(helpers.getStyle(container, 'padding-right'), 10);
+ var w = container.clientWidth - paddingLeft - paddingRight;
var cw = helpers.getConstraintWidth(domNode);
return isNaN(cw)? w : Math.min(w, cw);
};
helpers.getMaximumHeight = function(domNode) {
var container = domNode.parentNode;
- var padding = parseInt(helpers.getStyle(container, 'padding-top')) + parseInt(helpers.getStyle(container, 'padding-bottom'));
- var h = container.clientHeight - padding;
+ var paddingTop = parseInt(helpers.getStyle(container, 'padding-top'), 10);
+ var paddingBottom = parseInt(helpers.getStyle(container, 'padding-bottom'), 10);
+ var h = container.clientHeight - paddingTop - paddingBottom;
var ch = helpers.getConstraintHeight(domNode);
return isNaN(ch)? h : Math.min(h, ch);
};
@@ -5604,32 +5798,31 @@ module.exports = function(Chart) {
document.defaultView.getComputedStyle(el, null).getPropertyValue(property);
};
helpers.retinaScale = function(chart) {
- var ctx = chart.ctx;
- var canvas = chart.canvas;
- var width = canvas.width;
- var height = canvas.height;
var pixelRatio = chart.currentDevicePixelRatio = window.devicePixelRatio || 1;
+ if (pixelRatio === 1) {
+ return;
+ }
- if (pixelRatio !== 1) {
- canvas.height = height * pixelRatio;
- canvas.width = width * pixelRatio;
- ctx.scale(pixelRatio, pixelRatio);
+ var canvas = chart.canvas;
+ var height = chart.height;
+ var width = chart.width;
- // Store the device pixel ratio so that we can go backwards in `destroy`.
- // The devicePixelRatio changes with zoom, so there are no guarantees that it is the same
- // when destroy is called
- chart.originalDevicePixelRatio = chart.originalDevicePixelRatio || pixelRatio;
- }
+ canvas.height = height * pixelRatio;
+ canvas.width = width * pixelRatio;
+ chart.ctx.scale(pixelRatio, pixelRatio);
- canvas.style.width = width + 'px';
+ // If no style has been set on the canvas, the render size is used as display size,
+ // making the chart visually bigger, so let's enforce it to the "correct" values.
+ // See https://github.com/chartjs/Chart.js/issues/3575
canvas.style.height = height + 'px';
+ canvas.style.width = width + 'px';
};
- //-- Canvas methods
+ // -- Canvas methods
helpers.clear = function(chart) {
chart.ctx.clearRect(0, 0, chart.width, chart.height);
};
helpers.fontString = function(pixelSize, fontStyle, fontFamily) {
- return fontStyle + " " + pixelSize + "px " + fontFamily;
+ return fontStyle + ' ' + pixelSize + 'px ' + fontFamily;
};
helpers.longestText = function(ctx, font, arrayOfThings, cache) {
cache = cache || {};
@@ -5669,7 +5862,7 @@ module.exports = function(Chart) {
}
return longest;
};
- helpers.measureText = function (ctx, data, gc, longest, string) {
+ helpers.measureText = function(ctx, data, gc, longest, string) {
var textWidth = data[string];
if (!textWidth) {
textWidth = data[string] = ctx.measureText(string).width;
@@ -5706,7 +5899,7 @@ module.exports = function(Chart) {
};
helpers.color = function(c) {
if (!color) {
- console.log('Color.js not found!');
+ console.error('Color.js not found!');
return c;
}
@@ -5717,59 +5910,18 @@ module.exports = function(Chart) {
return color(c);
};
- helpers.addResizeListener = function(node, callback) {
- // Hide an iframe before the node
- var hiddenIframe = document.createElement('iframe');
- var hiddenIframeClass = 'chartjs-hidden-iframe';
-
- if (hiddenIframe.classlist) {
- // can use classlist
- hiddenIframe.classlist.add(hiddenIframeClass);
- } else {
- hiddenIframe.setAttribute('class', hiddenIframeClass);
- }
-
- // Set the style
- hiddenIframe.tabIndex = -1;
- var style = hiddenIframe.style;
- style.width = '100%';
- style.display = 'block';
- style.border = 0;
- style.height = 0;
- style.margin = 0;
- style.position = 'absolute';
- style.left = 0;
- style.right = 0;
- style.top = 0;
- style.bottom = 0;
-
- // Insert the iframe so that contentWindow is available
- node.insertBefore(hiddenIframe, node.firstChild);
-
- (hiddenIframe.contentWindow || hiddenIframe).onresize = function() {
- if (callback) {
- callback();
- }
- };
- };
- helpers.removeResizeListener = function(node) {
- var hiddenIframe = node.querySelector('.chartjs-hidden-iframe');
-
- // Remove the resize detect iframe
- if (hiddenIframe) {
- hiddenIframe.parentNode.removeChild(hiddenIframe);
- }
- };
helpers.isArray = Array.isArray?
- function(obj) { return Array.isArray(obj); } :
+ function(obj) {
+ return Array.isArray(obj);
+ } :
function(obj) {
return Object.prototype.toString.call(obj) === '[object Array]';
};
- //! @see http://stackoverflow.com/a/14853974
+ // ! @see http://stackoverflow.com/a/14853974
helpers.arrayEquals = function(a0, a1) {
var i, ilen, v0, v1;
- if (!a0 || !a1 || a0.length != a1.length) {
+ if (!a0 || !a1 || a0.length !== a1.length) {
return false;
}
@@ -5781,7 +5933,7 @@ module.exports = function(Chart) {
if (!helpers.arrayEquals(v0, v1)) {
return false;
}
- } else if (v0 != v1) {
+ } else if (v0 !== v1) {
// NOTE: two different object instances will never be equal: {x:20} != {x:20}
return false;
}
@@ -5794,89 +5946,350 @@ module.exports = function(Chart) {
fn.apply(_tArg, args);
}
};
- helpers.getHoverColor = function(color) {
+ helpers.getHoverColor = function(colorValue) {
/* global CanvasPattern */
- return (color instanceof CanvasPattern) ?
- color :
- helpers.color(color).saturate(0.5).darken(0.1).rgbString();
+ return (colorValue instanceof CanvasPattern) ?
+ colorValue :
+ helpers.color(colorValue).saturate(0.5).darken(0.1).rgbString();
};
};
},{"3":3}],27:[function(require,module,exports){
-"use strict";
+'use strict';
-module.exports = function() {
+module.exports = function(Chart) {
+ var helpers = Chart.helpers;
- //Occupy the global variable of Chart, and create a simple base class
- var Chart = function(context, config) {
- var me = this;
- var helpers = Chart.helpers;
- me.config = config || {
- data: {
- datasets: []
+ /**
+ * Helper function to get relative position for an event
+ * @param {Event|IEvent} event - The event to get the position for
+ * @param {Chart} chart - The chart
+ * @returns {Point} the event position
+ */
+ function getRelativePosition(e, chart) {
+ if (e.native) {
+ return {
+ x: e.x,
+ y: e.y
+ };
+ }
+
+ return helpers.getRelativePosition(e, chart);
+ }
+
+ /**
+ * Helper function to traverse all of the visible elements in the chart
+ * @param chart {chart} the chart
+ * @param handler {Function} the callback to execute for each visible item
+ */
+ function parseVisibleItems(chart, handler) {
+ var datasets = chart.data.datasets;
+ var meta, i, j, ilen, jlen;
+
+ for (i = 0, ilen = datasets.length; i < ilen; ++i) {
+ if (!chart.isDatasetVisible(i)) {
+ continue;
}
- };
- // Support a jQuery'd canvas element
- if (context.length && context[0].getContext) {
- context = context[0];
+ meta = chart.getDatasetMeta(i);
+ for (j = 0, jlen = meta.data.length; j < jlen; ++j) {
+ var element = meta.data[j];
+ if (!element._view.skip) {
+ handler(element);
+ }
+ }
}
+ }
+
+ /**
+ * Helper function to get the items that intersect the event position
+ * @param items {ChartElement[]} elements to filter
+ * @param position {Point} the point to be nearest to
+ * @return {ChartElement[]} the nearest items
+ */
+ function getIntersectItems(chart, position) {
+ var elements = [];
+
+ parseVisibleItems(chart, function(element) {
+ if (element.inRange(position.x, position.y)) {
+ elements.push(element);
+ }
+ });
- // Support a canvas domnode
- if (context.getContext) {
- context = context.getContext("2d");
+ return elements;
+ }
+
+ /**
+ * Helper function to get the items nearest to the event position considering all visible items in teh chart
+ * @param chart {Chart} the chart to look at elements from
+ * @param position {Point} the point to be nearest to
+ * @param intersect {Boolean} if true, only consider items that intersect the position
+ * @param distanceMetric {Function} Optional function to provide the distance between
+ * @return {ChartElement[]} the nearest items
+ */
+ function getNearestItems(chart, position, intersect, distanceMetric) {
+ var minDistance = Number.POSITIVE_INFINITY;
+ var nearestItems = [];
+
+ if (!distanceMetric) {
+ distanceMetric = helpers.distanceBetweenPoints;
}
- me.ctx = context;
- me.canvas = context.canvas;
+ parseVisibleItems(chart, function(element) {
+ if (intersect && !element.inRange(position.x, position.y)) {
+ return;
+ }
+
+ var center = element.getCenterPoint();
+ var distance = distanceMetric(position, center);
- context.canvas.style.display = context.canvas.style.display || 'block';
+ if (distance < minDistance) {
+ nearestItems = [element];
+ minDistance = distance;
+ } else if (distance === minDistance) {
+ // Can have multiple items at the same distance in which case we sort by size
+ nearestItems.push(element);
+ }
+ });
- // Figure out what the size of the chart will be.
- // If the canvas has a specified width and height, we use those else
- // we look to see if the canvas node has a CSS width and height.
- // If there is still no height, fill the parent container
- me.width = context.canvas.width || parseInt(helpers.getStyle(context.canvas, 'width'), 10) || helpers.getMaximumWidth(context.canvas);
- me.height = context.canvas.height || parseInt(helpers.getStyle(context.canvas, 'height'), 10) || helpers.getMaximumHeight(context.canvas);
+ return nearestItems;
+ }
- me.aspectRatio = me.width / me.height;
+ function indexMode(chart, e, options) {
+ var position = getRelativePosition(e, chart.chart);
+ var distanceMetric = function(pt1, pt2) {
+ return Math.abs(pt1.x - pt2.x);
+ };
+ var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false, distanceMetric);
+ var elements = [];
- if (isNaN(me.aspectRatio) || isFinite(me.aspectRatio) === false) {
- // If the canvas has no size, try and figure out what the aspect ratio will be.
- // Some charts prefer square canvases (pie, radar, etc). If that is specified, use that
- // else use the canvas default ratio of 2
- me.aspectRatio = config.aspectRatio !== undefined ? config.aspectRatio : 2;
+ if (!items.length) {
+ return [];
}
- // Store the original style of the element so we can set it back
- me.originalCanvasStyleWidth = context.canvas.style.width;
- me.originalCanvasStyleHeight = context.canvas.style.height;
+ chart.data.datasets.forEach(function(dataset, datasetIndex) {
+ if (chart.isDatasetVisible(datasetIndex)) {
+ var meta = chart.getDatasetMeta(datasetIndex),
+ element = meta.data[items[0]._index];
- // High pixel density displays - multiply the size of the canvas height/width by the device pixel ratio, then scale.
- helpers.retinaScale(me);
- me.controller = new Chart.Controller(me);
-
- // Always bind this so that if the responsive state changes we still work
- helpers.addResizeListener(context.canvas.parentNode, function() {
- if (me.controller && me.controller.config.options.responsive) {
- me.controller.resize();
+ // don't count items that are skipped (null data)
+ if (element && !element._view.skip) {
+ elements.push(element);
+ }
}
});
- return me.controller ? me.controller : me;
+ return elements;
+ }
+
+ /**
+ * @interface IInteractionOptions
+ */
+ /**
+ * If true, only consider items that intersect the point
+ * @name IInterfaceOptions#boolean
+ * @type Boolean
+ */
+
+ /**
+ * Contains interaction related functions
+ * @namespace Chart.Interaction
+ */
+ Chart.Interaction = {
+ // Helper function for different modes
+ modes: {
+ single: function(chart, e) {
+ var position = getRelativePosition(e, chart.chart);
+ var elements = [];
+
+ parseVisibleItems(chart, function(element) {
+ if (element.inRange(position.x, position.y)) {
+ elements.push(element);
+ return elements;
+ }
+ });
+
+ return elements.slice(0, 1);
+ },
+
+ /**
+ * @function Chart.Interaction.modes.label
+ * @deprecated since version 2.4.0
+ */
+ label: indexMode,
+
+ /**
+ * Returns items at the same index. If the options.intersect parameter is true, we only return items if we intersect something
+ * If the options.intersect mode is false, we find the nearest item and return the items at the same index as that item
+ * @function Chart.Interaction.modes.index
+ * @since v2.4.0
+ * @param chart {chart} the chart we are returning items from
+ * @param e {Event} the event we are find things at
+ * @param options {IInteractionOptions} options to use during interaction
+ * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
+ */
+ index: indexMode,
+
+ /**
+ * Returns items in the same dataset. If the options.intersect parameter is true, we only return items if we intersect something
+ * If the options.intersect is false, we find the nearest item and return the items in that dataset
+ * @function Chart.Interaction.modes.dataset
+ * @param chart {chart} the chart we are returning items from
+ * @param e {Event} the event we are find things at
+ * @param options {IInteractionOptions} options to use during interaction
+ * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
+ */
+ dataset: function(chart, e, options) {
+ var position = getRelativePosition(e, chart.chart);
+ var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false);
+
+ if (items.length > 0) {
+ items = chart.getDatasetMeta(items[0]._datasetIndex).data;
+ }
+
+ return items;
+ },
+
+ /**
+ * @function Chart.Interaction.modes.x-axis
+ * @deprecated since version 2.4.0. Use index mode and intersect == true
+ */
+ 'x-axis': function(chart, e) {
+ return indexMode(chart, e, true);
+ },
+
+ /**
+ * Point mode returns all elements that hit test based on the event position
+ * of the event
+ * @function Chart.Interaction.modes.intersect
+ * @param chart {chart} the chart we are returning items from
+ * @param e {Event} the event we are find things at
+ * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
+ */
+ point: function(chart, e) {
+ var position = getRelativePosition(e, chart.chart);
+ return getIntersectItems(chart, position);
+ },
+
+ /**
+ * nearest mode returns the element closest to the point
+ * @function Chart.Interaction.modes.intersect
+ * @param chart {chart} the chart we are returning items from
+ * @param e {Event} the event we are find things at
+ * @param options {IInteractionOptions} options to use
+ * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
+ */
+ nearest: function(chart, e, options) {
+ var position = getRelativePosition(e, chart.chart);
+ var nearestItems = getNearestItems(chart, position, options.intersect);
+
+ // We have multiple items at the same distance from the event. Now sort by smallest
+ if (nearestItems.length > 1) {
+ nearestItems.sort(function(a, b) {
+ var sizeA = a.getArea();
+ var sizeB = b.getArea();
+ var ret = sizeA - sizeB;
+
+ if (ret === 0) {
+ // if equal sort by dataset index
+ ret = a._datasetIndex - b._datasetIndex;
+ }
+
+ return ret;
+ });
+ }
+
+ // Return only 1 item
+ return nearestItems.slice(0, 1);
+ },
+
+ /**
+ * x mode returns the elements that hit-test at the current x coordinate
+ * @function Chart.Interaction.modes.x
+ * @param chart {chart} the chart we are returning items from
+ * @param e {Event} the event we are find things at
+ * @param options {IInteractionOptions} options to use
+ * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
+ */
+ x: function(chart, e, options) {
+ var position = getRelativePosition(e, chart.chart);
+ var items = [];
+ var intersectsItem = false;
+
+ parseVisibleItems(chart, function(element) {
+ if (element.inXRange(position.x)) {
+ items.push(element);
+ }
+
+ if (element.inRange(position.x, position.y)) {
+ intersectsItem = true;
+ }
+ });
+
+ // If we want to trigger on an intersect and we don't have any items
+ // that intersect the position, return nothing
+ if (options.intersect && !intersectsItem) {
+ items = [];
+ }
+ return items;
+ },
+
+ /**
+ * y mode returns the elements that hit-test at the current y coordinate
+ * @function Chart.Interaction.modes.y
+ * @param chart {chart} the chart we are returning items from
+ * @param e {Event} the event we are find things at
+ * @param options {IInteractionOptions} options to use
+ * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
+ */
+ y: function(chart, e, options) {
+ var position = getRelativePosition(e, chart.chart);
+ var items = [];
+ var intersectsItem = false;
+
+ parseVisibleItems(chart, function(element) {
+ if (element.inYRange(position.y)) {
+ items.push(element);
+ }
+
+ if (element.inRange(position.x, position.y)) {
+ intersectsItem = true;
+ }
+ });
+
+ // If we want to trigger on an intersect and we don't have any items
+ // that intersect the position, return nothing
+ if (options.intersect && !intersectsItem) {
+ items = [];
+ }
+ return items;
+ }
+ }
+ };
+};
+
+},{}],28:[function(require,module,exports){
+'use strict';
+module.exports = function() {
+
+ // Occupy the global variable of Chart, and create a simple base class
+ var Chart = function(item, config) {
+ this.controller = new Chart.Controller(item, config, this);
+ return this.controller;
};
- //Globally expose the defaults to allow for user updating/changing
+ // Globally expose the defaults to allow for user updating/changing
Chart.defaults = {
global: {
responsive: true,
responsiveAnimationDuration: 0,
maintainAspectRatio: true,
- events: ["mousemove", "mouseout", "click", "touchstart", "touchmove"],
+ events: ['mousemove', 'mouseout', 'click', 'touchstart', 'touchmove'],
hover: {
onHover: null,
- mode: 'single',
+ mode: 'nearest',
+ intersect: true,
animationDuration: 400
},
onClick: null,
@@ -5903,7 +6316,7 @@ module.exports = function() {
}
text.push('</ul>');
- return text.join("");
+ return text.join('');
}
}
};
@@ -5911,11 +6324,10 @@ module.exports = function() {
Chart.Chart = Chart;
return Chart;
-
};
-},{}],28:[function(require,module,exports){
-"use strict";
+},{}],29:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -5949,25 +6361,43 @@ module.exports = function(Chart) {
return;
}
- var xPadding = 0;
- var yPadding = 0;
+ var layoutOptions = chartInstance.options.layout;
+ var padding = layoutOptions ? layoutOptions.padding : null;
+
+ var leftPadding = 0;
+ var rightPadding = 0;
+ var topPadding = 0;
+ var bottomPadding = 0;
+
+ if (!isNaN(padding)) {
+ // options.layout.padding is a number. assign to all
+ leftPadding = padding;
+ rightPadding = padding;
+ topPadding = padding;
+ bottomPadding = padding;
+ } else {
+ leftPadding = padding.left || 0;
+ rightPadding = padding.right || 0;
+ topPadding = padding.top || 0;
+ bottomPadding = padding.bottom || 0;
+ }
var leftBoxes = helpers.where(chartInstance.boxes, function(box) {
- return box.options.position === "left";
+ return box.options.position === 'left';
});
var rightBoxes = helpers.where(chartInstance.boxes, function(box) {
- return box.options.position === "right";
+ return box.options.position === 'right';
});
var topBoxes = helpers.where(chartInstance.boxes, function(box) {
- return box.options.position === "top";
+ return box.options.position === 'top';
});
var bottomBoxes = helpers.where(chartInstance.boxes, function(box) {
- return box.options.position === "bottom";
+ return box.options.position === 'bottom';
});
// Boxes that overlay the chartarea such as the radialLinear scale
var chartAreaBoxes = helpers.where(chartInstance.boxes, function(box) {
- return box.options.position === "chartArea";
+ return box.options.position === 'chartArea';
});
// Ensure that full width boxes are at the very top / bottom
@@ -6016,8 +6446,8 @@ module.exports = function(Chart) {
// 9. Tell any axes that overlay the chart area the positions of the chart area
// Step 1
- var chartWidth = width - (2 * xPadding);
- var chartHeight = height - (2 * yPadding);
+ var chartWidth = width - leftPadding - rightPadding;
+ var chartHeight = height - topPadding - bottomPadding;
var chartAreaWidth = chartWidth / 2; // min 50%
var chartAreaHeight = chartHeight / 2; // min 50%
@@ -6032,8 +6462,6 @@ module.exports = function(Chart) {
var maxChartAreaHeight = chartHeight;
var minBoxSizes = [];
- helpers.each(leftBoxes.concat(rightBoxes, topBoxes, bottomBoxes), getMinimumBoxSize);
-
function getMinimumBoxSize(box) {
var minSize;
var isHorizontal = box.isHorizontal();
@@ -6049,44 +6477,53 @@ module.exports = function(Chart) {
minBoxSizes.push({
horizontal: isHorizontal,
minSize: minSize,
- box: box
+ box: box,
});
}
- // At this point, maxChartAreaHeight and maxChartAreaWidth are the size the chart area could
- // be if the axes are drawn at their minimum sizes.
-
- // Steps 5 & 6
- var totalLeftBoxesWidth = xPadding;
- var totalRightBoxesWidth = xPadding;
- var totalTopBoxesHeight = yPadding;
- var totalBottomBoxesHeight = yPadding;
+ helpers.each(leftBoxes.concat(rightBoxes, topBoxes, bottomBoxes), getMinimumBoxSize);
- // Update, and calculate the left and right margins for the horizontal boxes
- helpers.each(leftBoxes.concat(rightBoxes), fitBox);
+ // If a horizontal box has padding, we move the left boxes over to avoid ugly charts (see issue #2478)
+ var maxHorizontalLeftPadding = 0;
+ var maxHorizontalRightPadding = 0;
+ var maxVerticalTopPadding = 0;
+ var maxVerticalBottomPadding = 0;
- helpers.each(leftBoxes, function(box) {
- totalLeftBoxesWidth += box.width;
+ helpers.each(topBoxes.concat(bottomBoxes), function(horizontalBox) {
+ if (horizontalBox.getPadding) {
+ var boxPadding = horizontalBox.getPadding();
+ maxHorizontalLeftPadding = Math.max(maxHorizontalLeftPadding, boxPadding.left);
+ maxHorizontalRightPadding = Math.max(maxHorizontalRightPadding, boxPadding.right);
+ }
});
- helpers.each(rightBoxes, function(box) {
- totalRightBoxesWidth += box.width;
+ helpers.each(leftBoxes.concat(rightBoxes), function(verticalBox) {
+ if (verticalBox.getPadding) {
+ var boxPadding = verticalBox.getPadding();
+ maxVerticalTopPadding = Math.max(maxVerticalTopPadding, boxPadding.top);
+ maxVerticalBottomPadding = Math.max(maxVerticalBottomPadding, boxPadding.bottom);
+ }
});
- // Set the Left and Right margins for the horizontal boxes
- helpers.each(topBoxes.concat(bottomBoxes), fitBox);
+ // At this point, maxChartAreaHeight and maxChartAreaWidth are the size the chart area could
+ // be if the axes are drawn at their minimum sizes.
+ // Steps 5 & 6
+ var totalLeftBoxesWidth = leftPadding;
+ var totalRightBoxesWidth = rightPadding;
+ var totalTopBoxesHeight = topPadding;
+ var totalBottomBoxesHeight = bottomPadding;
// Function to fit a box
function fitBox(box) {
- var minBoxSize = helpers.findNextWhere(minBoxSizes, function(minBoxSize) {
- return minBoxSize.box === box;
+ var minBoxSize = helpers.findNextWhere(minBoxSizes, function(minBox) {
+ return minBox.box === box;
});
if (minBoxSize) {
if (box.isHorizontal()) {
var scaleMargin = {
- left: totalLeftBoxesWidth,
- right: totalRightBoxesWidth,
+ left: Math.max(totalLeftBoxesWidth, maxHorizontalLeftPadding),
+ right: Math.max(totalRightBoxesWidth, maxHorizontalRightPadding),
top: 0,
bottom: 0
};
@@ -6100,6 +6537,20 @@ module.exports = function(Chart) {
}
}
+ // Update, and calculate the left and right margins for the horizontal boxes
+ helpers.each(leftBoxes.concat(rightBoxes), fitBox);
+
+ helpers.each(leftBoxes, function(box) {
+ totalLeftBoxesWidth += box.width;
+ });
+
+ helpers.each(rightBoxes, function(box) {
+ totalRightBoxesWidth += box.width;
+ });
+
+ // Set the Left and Right margins for the horizontal boxes
+ helpers.each(topBoxes.concat(bottomBoxes), fitBox);
+
// Figure out how much margin is on the top and bottom of the vertical boxes
helpers.each(topBoxes, function(box) {
totalTopBoxesHeight += box.height;
@@ -6109,12 +6560,9 @@ module.exports = function(Chart) {
totalBottomBoxesHeight += box.height;
});
- // Let the left layout know the final margin
- helpers.each(leftBoxes.concat(rightBoxes), finalFitVerticalBox);
-
function finalFitVerticalBox(box) {
- var minBoxSize = helpers.findNextWhere(minBoxSizes, function(minBoxSize) {
- return minBoxSize.box === box;
+ var minBoxSize = helpers.findNextWhere(minBoxSizes, function(minSize) {
+ return minSize.box === box;
});
var scaleMargin = {
@@ -6129,12 +6577,15 @@ module.exports = function(Chart) {
}
}
- // Recalculate because the size of each layout might have changed slightly due to the margins (label rotation for instance)
- totalLeftBoxesWidth = xPadding;
- totalRightBoxesWidth = xPadding;
- totalTopBoxesHeight = yPadding;
- totalBottomBoxesHeight = yPadding;
-
+ // Let the left layout know the final margin
+ helpers.each(leftBoxes.concat(rightBoxes), finalFitVerticalBox);
+
+ // Recalculate because the size of each layout might have changed slightly due to the margins (label rotation for instance)
+ totalLeftBoxesWidth = leftPadding;
+ totalRightBoxesWidth = rightPadding;
+ totalTopBoxesHeight = topPadding;
+ totalBottomBoxesHeight = bottomPadding;
+
helpers.each(leftBoxes, function(box) {
totalLeftBoxesWidth += box.width;
});
@@ -6150,6 +6601,15 @@ module.exports = function(Chart) {
totalBottomBoxesHeight += box.height;
});
+ // We may be adding some padding to account for rotated x axis labels
+ var leftPaddingAddition = Math.max(maxHorizontalLeftPadding - totalLeftBoxesWidth, 0);
+ totalLeftBoxesWidth += leftPaddingAddition;
+ totalRightBoxesWidth += Math.max(maxHorizontalRightPadding - totalRightBoxesWidth, 0);
+
+ var topPaddingAddition = Math.max(maxVerticalTopPadding - totalTopBoxesHeight, 0);
+ totalTopBoxesHeight += topPaddingAddition;
+ totalBottomBoxesHeight += Math.max(maxVerticalBottomPadding - totalBottomBoxesHeight, 0);
+
// Figure out if our chart area changed. This would occur if the dataset layout label rotation
// changed due to the application of the margins in step 6. Since we can only get bigger, this is safe to do
// without calling `fit` again
@@ -6182,22 +6642,13 @@ module.exports = function(Chart) {
}
// Step 7 - Position the boxes
- var left = xPadding;
- var top = yPadding;
-
- helpers.each(leftBoxes.concat(topBoxes), placeBox);
-
- // Account for chart width and height
- left += maxChartAreaWidth;
- top += maxChartAreaHeight;
-
- helpers.each(rightBoxes, placeBox);
- helpers.each(bottomBoxes, placeBox);
+ var left = leftPadding + leftPaddingAddition;
+ var top = topPadding + topPaddingAddition;
function placeBox(box) {
if (box.isHorizontal()) {
- box.left = box.options.fullWidth ? xPadding : totalLeftBoxesWidth;
- box.right = box.options.fullWidth ? width - xPadding : totalLeftBoxesWidth + maxChartAreaWidth;
+ box.left = box.options.fullWidth ? leftPadding : totalLeftBoxesWidth;
+ box.right = box.options.fullWidth ? width - rightPadding : totalLeftBoxesWidth + maxChartAreaWidth;
box.top = top;
box.bottom = top + box.height;
@@ -6216,6 +6667,15 @@ module.exports = function(Chart) {
}
}
+ helpers.each(leftBoxes.concat(topBoxes), placeBox);
+
+ // Account for chart width and height
+ left += maxChartAreaWidth;
+ top += maxChartAreaHeight;
+
+ helpers.each(rightBoxes, placeBox);
+ helpers.each(bottomBoxes, placeBox);
+
// Step 8
chartInstance.chartArea = {
left: totalLeftBoxesWidth,
@@ -6237,8 +6697,8 @@ module.exports = function(Chart) {
};
};
-},{}],29:[function(require,module,exports){
-"use strict";
+},{}],30:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -6265,6 +6725,8 @@ module.exports = function(Chart) {
ci.update();
},
+ onHover: null,
+
labels: {
boxWidth: 40,
padding: 10,
@@ -6302,6 +6764,18 @@ module.exports = function(Chart) {
}
};
+ /**
+ * Helper function to get the box width based on the usePointStyle option
+ * @param labelopts {Object} the label options on the legend
+ * @param fontSize {Number} the label font size
+ * @return {Number} width of the color box area
+ */
+ function getBoxWidth(labelOpts, fontSize) {
+ return labelOpts.usePointStyle ?
+ fontSize * Math.SQRT2 :
+ labelOpts.boxWidth;
+ }
+
Chart.Legend = Chart.Element.extend({
initialize: function(config) {
@@ -6314,7 +6788,7 @@ module.exports = function(Chart) {
this.doughnutMode = false;
},
- // These methods are ordered by lifecyle. Utilities then follow.
+ // These methods are ordered by lifecycle. Utilities then follow.
// Any function defined here is inherited by all legend types.
// Any function can be extended by the legend type
@@ -6388,10 +6862,20 @@ module.exports = function(Chart) {
beforeBuildLabels: noop,
buildLabels: function() {
var me = this;
- me.legendItems = me.options.labels.generateLabels.call(me, me.chart);
- if(me.options.reverse){
- me.legendItems.reverse();
+ var labelOpts = me.options.labels;
+ var legendItems = labelOpts.generateLabels.call(me, me.chart);
+
+ if (labelOpts.filter) {
+ legendItems = legendItems.filter(function(item) {
+ return labelOpts.filter(item, me.chart.data);
+ });
+ }
+
+ if (me.options.reverse) {
+ legendItems.reverse();
}
+
+ me.legendItems = legendItems;
},
afterBuildLabels: noop,
@@ -6438,15 +6922,13 @@ module.exports = function(Chart) {
var lineWidths = me.lineWidths = [0];
var totalHeight = me.legendItems.length ? fontSize + (labelOpts.padding) : 0;
- ctx.textAlign = "left";
+ ctx.textAlign = 'left';
ctx.textBaseline = 'top';
helpers.each(me.legendItems, function(legendItem, i) {
- var boxWidth = labelOpts.usePointStyle ?
- fontSize * Math.sqrt(2) :
- labelOpts.boxWidth;
-
+ var boxWidth = getBoxWidth(labelOpts, fontSize);
var width = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
+
if (lineWidths[lineWidths.length - 1] + width + labelOpts.padding >= me.width) {
totalHeight += fontSize + (labelOpts.padding);
lineWidths[lineWidths.length] = me.left;
@@ -6474,10 +6956,7 @@ module.exports = function(Chart) {
var itemHeight = fontSize + vPadding;
helpers.each(me.legendItems, function(legendItem, i) {
- // If usePointStyle is set, multiple boxWidth by 2 since it represents
- // the radius and not truly the width
- var boxWidth = labelOpts.usePointStyle ? 2 * labelOpts.boxWidth : labelOpts.boxWidth;
-
+ var boxWidth = getBoxWidth(labelOpts, fontSize);
var itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
// If too tall, go to new column
@@ -6515,10 +6994,10 @@ module.exports = function(Chart) {
// Shared Methods
isHorizontal: function() {
- return this.options.position === "top" || this.options.position === "bottom";
+ return this.options.position === 'top' || this.options.position === 'bottom';
},
- // Actualy draw the legend on the canvas
+ // Actually draw the legend on the canvas
draw: function() {
var me = this;
var opts = me.options;
@@ -6539,14 +7018,14 @@ module.exports = function(Chart) {
labelFont = helpers.fontString(fontSize, fontStyle, fontFamily);
// Canvas setup
- ctx.textAlign = "left";
+ ctx.textAlign = 'left';
ctx.textBaseline = 'top';
ctx.lineWidth = 0.5;
ctx.strokeStyle = fontColor; // for strikethrough effect
ctx.fillStyle = fontColor; // render in correct colour
ctx.font = labelFont;
- var boxWidth = labelOpts.boxWidth,
+ var boxWidth = getBoxWidth(labelOpts, fontSize),
hitboxes = me.legendHitBoxes;
// current position
@@ -6564,6 +7043,7 @@ module.exports = function(Chart) {
ctx.lineJoin = itemOrDefault(legendItem.lineJoin, lineDefault.borderJoinStyle);
ctx.lineWidth = itemOrDefault(legendItem.lineWidth, lineDefault.borderWidth);
ctx.strokeStyle = itemOrDefault(legendItem.strokeStyle, globalDefault.defaultColor);
+ var isLineWidthZero = (itemOrDefault(legendItem.lineWidth, lineDefault.borderWidth) === 0);
if (ctx.setLineDash) {
// IE 9 and 10 do not support line dash
@@ -6571,7 +7051,7 @@ module.exports = function(Chart) {
}
if (opts.labels && opts.labels.usePointStyle) {
- // Recalulate x and y for drawPoint() because its expecting
+ // Recalculate x and y for drawPoint() because its expecting
// x and y to be center of figure (instead of top left)
var radius = fontSize * Math.SQRT2 / 2;
var offSet = radius / Math.SQRT2;
@@ -6580,10 +7060,11 @@ module.exports = function(Chart) {
// Draw pointStyle as legend symbol
Chart.canvasHelpers.drawPoint(ctx, legendItem.pointStyle, radius, centerX, centerY);
- }
- else {
+ } else {
// Draw box as legend symbol
- ctx.strokeRect(x, y, boxWidth, fontSize);
+ if (!isLineWidthZero) {
+ ctx.strokeRect(x, y, boxWidth, fontSize);
+ }
ctx.fillRect(x, y, boxWidth, fontSize);
}
@@ -6621,9 +7102,7 @@ module.exports = function(Chart) {
var itemHeight = fontSize + labelOpts.padding;
helpers.each(me.legendItems, function(legendItem, i) {
var textWidth = ctx.measureText(legendItem.text).width,
- width = labelOpts.usePointStyle ?
- fontSize + (fontSize / 2) + textWidth :
- boxWidth + (fontSize / 2) + textWidth,
+ width = boxWidth + (fontSize / 2) + textWidth,
x = cursor.x,
y = cursor.y;
@@ -6633,12 +7112,10 @@ module.exports = function(Chart) {
cursor.line++;
x = cursor.x = me.left + ((legendWidth - lineWidths[cursor.line]) / 2);
}
- } else {
- if (y + itemHeight > me.bottom) {
- x = cursor.x = x + me.columnWidths[cursor.line] + labelOpts.padding;
- y = cursor.y = me.top;
- cursor.line++;
- }
+ } else if (y + itemHeight > me.bottom) {
+ x = cursor.x = x + me.columnWidths[cursor.line] + labelOpts.padding;
+ y = cursor.y = me.top + labelOpts.padding;
+ cursor.line++;
}
drawLegendBox(x, y, legendItem);
@@ -6659,13 +7136,33 @@ module.exports = function(Chart) {
}
},
- // Handle an event
+ /**
+ * Handle an event
+ * @private
+ * @param {IEvent} event - The event to handle
+ * @return {Boolean} true if a change occured
+ */
handleEvent: function(e) {
var me = this;
- var position = helpers.getRelativePosition(e, me.chart.chart),
- x = position.x,
- y = position.y,
- opts = me.options;
+ var opts = me.options;
+ var type = e.type === 'mouseup' ? 'click' : e.type;
+ var changed = false;
+
+ if (type === 'mousemove') {
+ if (!opts.onHover) {
+ return;
+ }
+ } else if (type === 'click') {
+ if (!opts.onClick) {
+ return;
+ }
+ } else {
+ return;
+ }
+
+ // Chart event already has relative position in it
+ var x = e.x,
+ y = e.y;
if (x >= me.left && x <= me.right && y >= me.top && y <= me.bottom) {
// See if we are touching one of the dataset boxes
@@ -6675,41 +7172,77 @@ module.exports = function(Chart) {
if (x >= hitBox.left && x <= hitBox.left + hitBox.width && y >= hitBox.top && y <= hitBox.top + hitBox.height) {
// Touching an element
- if (opts.onClick) {
- opts.onClick.call(me, e, me.legendItems[i]);
+ if (type === 'click') {
+ // use e.native for backwards compatibility
+ opts.onClick.call(me, e.native, me.legendItems[i]);
+ changed = true;
+ break;
+ } else if (type === 'mousemove') {
+ // use e.native for backwards compatibility
+ opts.onHover.call(me, e.native, me.legendItems[i]);
+ changed = true;
+ break;
}
- break;
}
}
}
+
+ return changed;
}
});
+ function createNewLegendAndAttach(chartInstance, legendOpts) {
+ var legend = new Chart.Legend({
+ ctx: chartInstance.chart.ctx,
+ options: legendOpts,
+ chart: chartInstance
+ });
+ chartInstance.legend = legend;
+ Chart.layoutService.addBox(chartInstance, legend);
+ }
+
// Register the legend plugin
Chart.plugins.register({
beforeInit: function(chartInstance) {
- var opts = chartInstance.options;
- var legendOpts = opts.legend;
+ var legendOpts = chartInstance.options.legend;
if (legendOpts) {
- chartInstance.legend = new Chart.Legend({
- ctx: chartInstance.chart.ctx,
- options: legendOpts,
- chart: chartInstance
- });
+ createNewLegendAndAttach(chartInstance, legendOpts);
+ }
+ },
+ beforeUpdate: function(chartInstance) {
+ var legendOpts = chartInstance.options.legend;
+
+ if (legendOpts) {
+ legendOpts = helpers.configMerge(Chart.defaults.global.legend, legendOpts);
- Chart.layoutService.addBox(chartInstance, chartInstance.legend);
+ if (chartInstance.legend) {
+ chartInstance.legend.options = legendOpts;
+ } else {
+ createNewLegendAndAttach(chartInstance, legendOpts);
+ }
+ } else {
+ Chart.layoutService.removeBox(chartInstance, chartInstance.legend);
+ delete chartInstance.legend;
+ }
+ },
+ afterEvent: function(chartInstance, e) {
+ var legend = chartInstance.legend;
+ if (legend) {
+ legend.handleEvent(e);
}
}
});
};
-},{}],30:[function(require,module,exports){
-"use strict";
+},{}],31:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
- var noop = Chart.helpers.noop;
+ var helpers = Chart.helpers;
+
+ Chart.defaults.global.plugins = {};
/**
* The plugin service singleton
@@ -6717,8 +7250,20 @@ module.exports = function(Chart) {
* @since 2.1.0
*/
Chart.plugins = {
+ /**
+ * Globally registered plugins.
+ * @private
+ */
_plugins: [],
+ /**
+ * This identifier is used to invalidate the descriptors cache attached to each chart
+ * when a global plugin is registered or unregistered. In this case, the cache ID is
+ * incremented and descriptors are regenerated during following API calls.
+ * @private
+ */
+ _cacheId: 0,
+
/**
* Registers the given plugin(s) if not already registered.
* @param {Array|Object} plugins plugin instance(s).
@@ -6730,6 +7275,8 @@ module.exports = function(Chart) {
p.push(plugin);
}
});
+
+ this._cacheId++;
},
/**
@@ -6744,14 +7291,17 @@ module.exports = function(Chart) {
p.splice(idx, 1);
}
});
+
+ this._cacheId++;
},
/**
- * Remove all registered p^lugins.
+ * Remove all registered plugins.
* @since 2.1.5
*/
clear: function() {
this._plugins = [];
+ this._cacheId++;
},
/**
@@ -6764,7 +7314,7 @@ module.exports = function(Chart) {
},
/**
- * Returns all registered plugin intances.
+ * Returns all registered plugin instances.
* @returns {Array} array of plugin objects.
* @since 2.1.5
*/
@@ -6773,70 +7323,247 @@ module.exports = function(Chart) {
},
/**
- * Calls registered plugins on the specified extension, with the given args. This
- * method immediately returns as soon as a plugin explicitly returns false. The
+ * Calls enabled plugins for `chart` on the specified hook and with the given args.
+ * This method immediately returns as soon as a plugin explicitly returns false. The
* returned value can be used, for instance, to interrupt the current action.
- * @param {String} extension the name of the plugin method to call (e.g. 'beforeUpdate').
- * @param {Array} [args] extra arguments to apply to the extension call.
+ * @param {Object} chart - The chart instance for which plugins should be called.
+ * @param {String} hook - The name of the plugin method to call (e.g. 'beforeUpdate').
+ * @param {Array} [args] - Extra arguments to apply to the hook call.
* @returns {Boolean} false if any of the plugins return false, else returns true.
*/
- notify: function(extension, args) {
- var plugins = this._plugins;
- var ilen = plugins.length;
- var i, plugin;
+ notify: function(chart, hook, args) {
+ var descriptors = this.descriptors(chart);
+ var ilen = descriptors.length;
+ var i, descriptor, plugin, params, method;
for (i=0; i<ilen; ++i) {
- plugin = plugins[i];
- if (typeof plugin[extension] === 'function') {
- if (plugin[extension].apply(plugin, args || []) === false) {
+ descriptor = descriptors[i];
+ plugin = descriptor.plugin;
+ method = plugin[hook];
+ if (typeof method === 'function') {
+ params = [chart].concat(args || []);
+ params.push(descriptor.options);
+ if (method.apply(plugin, params) === false) {
return false;
}
}
}
return true;
- }
- };
+ },
- /**
- * Plugin extension methods.
- * @interface Chart.PluginBase
- * @since 2.1.0
- */
- Chart.PluginBase = Chart.Element.extend({
- // Called at start of chart init
- beforeInit: noop,
+ /**
+ * Returns descriptors of enabled plugins for the given chart.
+ * @returns {Array} [{ plugin, options }]
+ * @private
+ */
+ descriptors: function(chart) {
+ var cache = chart._plugins || (chart._plugins = {});
+ if (cache.id === this._cacheId) {
+ return cache.descriptors;
+ }
- // Called at end of chart init
- afterInit: noop,
+ var plugins = [];
+ var descriptors = [];
+ var config = (chart && chart.config) || {};
+ var defaults = Chart.defaults.global.plugins;
+ var options = (config.options && config.options.plugins) || {};
- // Called at start of update
- beforeUpdate: noop,
+ this._plugins.concat(config.plugins || []).forEach(function(plugin) {
+ var idx = plugins.indexOf(plugin);
+ if (idx !== -1) {
+ return;
+ }
- // Called at end of update
- afterUpdate: noop,
+ var id = plugin.id;
+ var opts = options[id];
+ if (opts === false) {
+ return;
+ }
+
+ if (opts === true) {
+ opts = helpers.clone(defaults[id]);
+ }
- // Called at start of draw
- beforeDraw: noop,
+ plugins.push(plugin);
+ descriptors.push({
+ plugin: plugin,
+ options: opts || {}
+ });
+ });
- // Called at end of draw
- afterDraw: noop,
+ cache.descriptors = descriptors;
+ cache.id = this._cacheId;
+ return descriptors;
+ }
+ };
- // Called during destroy
- destroy: noop
- });
+ /**
+ * Plugin extension hooks.
+ * @interface IPlugin
+ * @since 2.1.0
+ */
+ /**
+ * @method IPlugin#beforeInit
+ * @desc Called before initializing `chart`.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#afterInit
+ * @desc Called after `chart` has been initialized and before the first update.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#beforeUpdate
+ * @desc Called before updating `chart`. If any plugin returns `false`, the update
+ * is cancelled (and thus subsequent render(s)) until another `update` is triggered.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ * @returns {Boolean} `false` to cancel the chart update.
+ */
+ /**
+ * @method IPlugin#afterUpdate
+ * @desc Called after `chart` has been updated and before rendering. Note that this
+ * hook will not be called if the chart update has been previously cancelled.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#beforeDatasetsUpdate
+ * @desc Called before updating the `chart` datasets. If any plugin returns `false`,
+ * the datasets update is cancelled until another `update` is triggered.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ * @returns {Boolean} false to cancel the datasets update.
+ * @since version 2.1.5
+ */
+ /**
+ * @method IPlugin#afterDatasetsUpdate
+ * @desc Called after the `chart` datasets have been updated. Note that this hook
+ * will not be called if the datasets update has been previously cancelled.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ * @since version 2.1.5
+ */
+ /**
+ * @method IPlugin#beforeLayout
+ * @desc Called before laying out `chart`. If any plugin returns `false`,
+ * the layout update is cancelled until another `update` is triggered.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ * @returns {Boolean} `false` to cancel the chart layout.
+ */
+ /**
+ * @method IPlugin#afterLayout
+ * @desc Called after the `chart` has been layed out. Note that this hook will not
+ * be called if the layout update has been previously cancelled.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#beforeRender
+ * @desc Called before rendering `chart`. If any plugin returns `false`,
+ * the rendering is cancelled until another `render` is triggered.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ * @returns {Boolean} `false` to cancel the chart rendering.
+ */
+ /**
+ * @method IPlugin#afterRender
+ * @desc Called after the `chart` has been fully rendered (and animation completed). Note
+ * that this hook will not be called if the rendering has been previously cancelled.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#beforeDraw
+ * @desc Called before drawing `chart` at every animation frame specified by the given
+ * easing value. If any plugin returns `false`, the frame drawing is cancelled until
+ * another `render` is triggered.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
+ * @param {Object} options - The plugin options.
+ * @returns {Boolean} `false` to cancel the chart drawing.
+ */
+ /**
+ * @method IPlugin#afterDraw
+ * @desc Called after the `chart` has been drawn for the specific easing value. Note
+ * that this hook will not be called if the drawing has been previously cancelled.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#beforeDatasetsDraw
+ * @desc Called before drawing the `chart` datasets. If any plugin returns `false`,
+ * the datasets drawing is cancelled until another `render` is triggered.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
+ * @param {Object} options - The plugin options.
+ * @returns {Boolean} `false` to cancel the chart datasets drawing.
+ */
+ /**
+ * @method IPlugin#afterDatasetsDraw
+ * @desc Called after the `chart` datasets have been drawn. Note that this hook
+ * will not be called if the datasets drawing has been previously cancelled.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#beforeEvent
+ * @desc Called before processing the specified `event`. If any plugin returns `false`,
+ * the event will be discarded.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {IEvent} event - The event object.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#afterEvent
+ * @desc Called after the `event` has been consumed. Note that this hook
+ * will not be called if the `event` has been previously discarded.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {IEvent} event - The event object.
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#resize
+ * @desc Called after the chart as been resized.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Number} size - The new canvas display size (eq. canvas.style width & height).
+ * @param {Object} options - The plugin options.
+ */
+ /**
+ * @method IPlugin#destroy
+ * @desc Called after the chart as been destroyed.
+ * @param {Chart.Controller} chart - The chart instance.
+ * @param {Object} options - The plugin options.
+ */
/**
* Provided for backward compatibility, use Chart.plugins instead
* @namespace Chart.pluginService
* @deprecated since version 2.1.5
- * @todo remove me at version 3
+ * @todo remove at version 3
+ * @private
*/
Chart.pluginService = Chart.plugins;
+
+ /**
+ * Provided for backward compatibility, inheriting from Chart.PlugingBase has no
+ * effect, instead simply create/register plugins via plain JavaScript objects.
+ * @interface Chart.PluginBase
+ * @deprecated since version 2.5.0
+ * @todo remove at version 3
+ * @private
+ */
+ Chart.PluginBase = helpers.inherits({});
};
-},{}],31:[function(require,module,exports){
-"use strict";
+},{}],32:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -6844,19 +7571,19 @@ module.exports = function(Chart) {
Chart.defaults.scale = {
display: true,
- position: "left",
+ position: 'left',
// grid line settings
gridLines: {
display: true,
- color: "rgba(0, 0, 0, 0.1)",
+ color: 'rgba(0, 0, 0, 0.1)',
lineWidth: 1,
drawBorder: true,
drawOnChartArea: true,
drawTicks: true,
tickMarkLength: 10,
zeroLineWidth: 1,
- zeroLineColor: "rgba(0,0,0,0.25)",
+ zeroLineColor: 'rgba(0,0,0,0.25)',
offsetGridLines: false,
borderDash: [],
borderDashOffset: 0.0
@@ -6877,20 +7604,54 @@ module.exports = function(Chart) {
minRotation: 0,
maxRotation: 50,
mirror: false,
- padding: 10,
+ padding: 0,
reverse: false,
display: true,
autoSkip: true,
autoSkipPadding: 0,
labelOffset: 0,
// We pass through arrays to be rendered as multiline labels, we convert Others to strings here.
- callback: function(value) {
- return helpers.isArray(value) ? value : '' + value;
- }
+ callback: Chart.Ticks.formatters.values
}
};
+ function computeTextSize(context, tick, font) {
+ return helpers.isArray(tick) ?
+ helpers.longestText(context, font, tick) :
+ context.measureText(tick).width;
+ }
+
+ function parseFontOptions(options) {
+ var getValueOrDefault = helpers.getValueOrDefault;
+ var globalDefaults = Chart.defaults.global;
+ var size = getValueOrDefault(options.fontSize, globalDefaults.defaultFontSize);
+ var style = getValueOrDefault(options.fontStyle, globalDefaults.defaultFontStyle);
+ var family = getValueOrDefault(options.fontFamily, globalDefaults.defaultFontFamily);
+
+ return {
+ size: size,
+ style: style,
+ family: family,
+ font: helpers.fontString(size, style, family)
+ };
+ }
+
Chart.Scale = Chart.Element.extend({
+ /**
+ * Get the padding needed for the scale
+ * @method getPadding
+ * @private
+ * @returns {Padding} the necessary padding
+ */
+ getPadding: function() {
+ var me = this;
+ return {
+ left: me.paddingLeft || 0,
+ top: me.paddingTop || 0,
+ right: me.paddingRight || 0,
+ bottom: me.paddingBottom || 0
+ };
+ },
// These methods are ordered by lifecyle. Utilities then follow.
// Any function defined here is inherited by all scale types.
@@ -6914,6 +7675,7 @@ module.exports = function(Chart) {
top: 0,
bottom: 0
}, margins);
+ me.longestTextCache = me.longestTextCache || {};
// Dimensions
me.beforeSetDimensions();
@@ -7007,13 +7769,8 @@ module.exports = function(Chart) {
convertTicksToLabels: function() {
var me = this;
// Convert ticks to strings
- me.ticks = me.ticks.map(function(numericalTick, index, ticks) {
- if (me.options.ticks.userCallback) {
- return me.options.ticks.userCallback(numericalTick, index, ticks);
- }
- return me.options.ticks.callback(numericalTick, index, ticks);
- },
- me);
+ var tickOpts = me.options.ticks;
+ me.ticks = me.ticks.map(tickOpts.userCallback || tickOpts.callback);
},
afterTickToLabelConversion: function() {
helpers.callCallback(this.options.afterTickToLabelConversion, [this]);
@@ -7027,72 +7784,42 @@ module.exports = function(Chart) {
calculateTickRotation: function() {
var me = this;
var context = me.ctx;
- var globalDefaults = Chart.defaults.global;
- var optionTicks = me.options.ticks;
-
- //Get the width of each grid by calculating the difference
- //between x offsets between 0 and 1.
- var tickFontSize = helpers.getValueOrDefault(optionTicks.fontSize, globalDefaults.defaultFontSize);
- var tickFontStyle = helpers.getValueOrDefault(optionTicks.fontStyle, globalDefaults.defaultFontStyle);
- var tickFontFamily = helpers.getValueOrDefault(optionTicks.fontFamily, globalDefaults.defaultFontFamily);
- var tickLabelFont = helpers.fontString(tickFontSize, tickFontStyle, tickFontFamily);
- context.font = tickLabelFont;
-
- var firstWidth = context.measureText(me.ticks[0]).width;
- var lastWidth = context.measureText(me.ticks[me.ticks.length - 1]).width;
- var firstRotated;
-
- me.labelRotation = optionTicks.minRotation || 0;
- me.paddingRight = 0;
- me.paddingLeft = 0;
-
- if (me.options.display) {
- if (me.isHorizontal()) {
- me.paddingRight = lastWidth / 2 + 3;
- me.paddingLeft = firstWidth / 2 + 3;
-
- if (!me.longestTextCache) {
- me.longestTextCache = {};
- }
- var originalLabelWidth = helpers.longestText(context, tickLabelFont, me.ticks, me.longestTextCache);
- var labelWidth = originalLabelWidth;
- var cosRotation;
- var sinRotation;
-
- // Allow 3 pixels x2 padding either side for label readability
- // only the index matters for a dataset scale, but we want a consistent interface between scales
- var tickWidth = me.getPixelForTick(1) - me.getPixelForTick(0) - 6;
+ var tickOpts = me.options.ticks;
- //Max label rotation can be set or default to 90 - also act as a loop counter
- while (labelWidth > tickWidth && me.labelRotation < optionTicks.maxRotation) {
- cosRotation = Math.cos(helpers.toRadians(me.labelRotation));
- sinRotation = Math.sin(helpers.toRadians(me.labelRotation));
+ // Get the width of each grid by calculating the difference
+ // between x offsets between 0 and 1.
+ var tickFont = parseFontOptions(tickOpts);
+ context.font = tickFont.font;
- firstRotated = cosRotation * firstWidth;
+ var labelRotation = tickOpts.minRotation || 0;
- // We're right aligning the text now.
- if (firstRotated + tickFontSize / 2 > me.yLabelWidth) {
- me.paddingLeft = firstRotated + tickFontSize / 2;
- }
+ if (me.options.display && me.isHorizontal()) {
+ var originalLabelWidth = helpers.longestText(context, tickFont.font, me.ticks, me.longestTextCache);
+ var labelWidth = originalLabelWidth;
+ var cosRotation;
+ var sinRotation;
- me.paddingRight = tickFontSize / 2;
+ // Allow 3 pixels x2 padding either side for label readability
+ var tickWidth = me.getPixelForTick(1) - me.getPixelForTick(0) - 6;
- if (sinRotation * originalLabelWidth > me.maxHeight) {
- // go back one step
- me.labelRotation--;
- break;
- }
+ // Max label rotation can be set or default to 90 - also act as a loop counter
+ while (labelWidth > tickWidth && labelRotation < tickOpts.maxRotation) {
+ var angleRadians = helpers.toRadians(labelRotation);
+ cosRotation = Math.cos(angleRadians);
+ sinRotation = Math.sin(angleRadians);
- me.labelRotation++;
- labelWidth = cosRotation * originalLabelWidth;
+ if (sinRotation * originalLabelWidth > me.maxHeight) {
+ // go back one step
+ labelRotation--;
+ break;
}
+
+ labelRotation++;
+ labelWidth = cosRotation * originalLabelWidth;
}
}
- if (me.margins) {
- me.paddingLeft = Math.max(me.paddingLeft - me.margins.left, 0);
- me.paddingRight = Math.max(me.paddingRight - me.margins.right, 0);
- }
+ me.labelRotation = labelRotation;
},
afterCalculateTickRotation: function() {
helpers.callCallback(this.options.afterCalculateTickRotation, [this]);
@@ -7112,20 +7839,14 @@ module.exports = function(Chart) {
};
var opts = me.options;
- var globalDefaults = Chart.defaults.global;
var tickOpts = opts.ticks;
var scaleLabelOpts = opts.scaleLabel;
var gridLineOpts = opts.gridLines;
var display = opts.display;
var isHorizontal = me.isHorizontal();
- var tickFontSize = helpers.getValueOrDefault(tickOpts.fontSize, globalDefaults.defaultFontSize);
- var tickFontStyle = helpers.getValueOrDefault(tickOpts.fontStyle, globalDefaults.defaultFontStyle);
- var tickFontFamily = helpers.getValueOrDefault(tickOpts.fontFamily, globalDefaults.defaultFontFamily);
- var tickLabelFont = helpers.fontString(tickFontSize, tickFontStyle, tickFontFamily);
-
- var scaleLabelFontSize = helpers.getValueOrDefault(scaleLabelOpts.fontSize, globalDefaults.defaultFontSize);
-
+ var tickFont = parseFontOptions(tickOpts);
+ var scaleLabelFontSize = parseFontOptions(scaleLabelOpts).size * 1.5;
var tickMarkLength = opts.gridLines.tickMarkLength;
// Width
@@ -7146,85 +7867,91 @@ module.exports = function(Chart) {
// Are we showing a title for the scale?
if (scaleLabelOpts.display && display) {
if (isHorizontal) {
- minSize.height += (scaleLabelFontSize * 1.5);
+ minSize.height += scaleLabelFontSize;
} else {
- minSize.width += (scaleLabelFontSize * 1.5);
+ minSize.width += scaleLabelFontSize;
}
}
+ // Don't bother fitting the ticks if we are not showing them
if (tickOpts.display && display) {
- // Don't bother fitting the ticks if we are not showing them
- if (!me.longestTextCache) {
- me.longestTextCache = {};
- }
-
- var largestTextWidth = helpers.longestText(me.ctx, tickLabelFont, me.ticks, me.longestTextCache);
+ var largestTextWidth = helpers.longestText(me.ctx, tickFont.font, me.ticks, me.longestTextCache);
var tallestLabelHeightInLines = helpers.numberOfLabelLines(me.ticks);
- var lineSpace = tickFontSize * 0.5;
+ var lineSpace = tickFont.size * 0.5;
if (isHorizontal) {
// A horizontal axis is more constrained by the height.
me.longestLabelWidth = largestTextWidth;
+ var angleRadians = helpers.toRadians(me.labelRotation);
+ var cosRotation = Math.cos(angleRadians);
+ var sinRotation = Math.sin(angleRadians);
+
// TODO - improve this calculation
- var labelHeight = (Math.sin(helpers.toRadians(me.labelRotation)) * me.longestLabelWidth) + (tickFontSize * tallestLabelHeightInLines) + (lineSpace * tallestLabelHeightInLines);
+ var labelHeight = (sinRotation * largestTextWidth)
+ + (tickFont.size * tallestLabelHeightInLines)
+ + (lineSpace * tallestLabelHeightInLines);
minSize.height = Math.min(me.maxHeight, minSize.height + labelHeight);
- me.ctx.font = tickLabelFont;
+ me.ctx.font = tickFont.font;
- var firstLabelWidth = me.ctx.measureText(me.ticks[0]).width;
- var lastLabelWidth = me.ctx.measureText(me.ticks[me.ticks.length - 1]).width;
+ var firstTick = me.ticks[0];
+ var firstLabelWidth = computeTextSize(me.ctx, firstTick, tickFont.font);
+
+ var lastTick = me.ticks[me.ticks.length - 1];
+ var lastLabelWidth = computeTextSize(me.ctx, lastTick, tickFont.font);
// Ensure that our ticks are always inside the canvas. When rotated, ticks are right aligned which means that the right padding is dominated
// by the font height
- var cosRotation = Math.cos(helpers.toRadians(me.labelRotation));
- var sinRotation = Math.sin(helpers.toRadians(me.labelRotation));
- me.paddingLeft = me.labelRotation !== 0 ? (cosRotation * firstLabelWidth) + 3 : firstLabelWidth / 2 + 3; // add 3 px to move away from canvas edges
- me.paddingRight = me.labelRotation !== 0 ? (sinRotation * (tickFontSize / 2)) + 3 : lastLabelWidth / 2 + 3; // when rotated
+ if (me.labelRotation !== 0) {
+ me.paddingLeft = opts.position === 'bottom'? (cosRotation * firstLabelWidth) + 3: (cosRotation * lineSpace) + 3; // add 3 px to move away from canvas edges
+ me.paddingRight = opts.position === 'bottom'? (cosRotation * lineSpace) + 3: (cosRotation * lastLabelWidth) + 3;
+ } else {
+ me.paddingLeft = firstLabelWidth / 2 + 3; // add 3 px to move away from canvas edges
+ me.paddingRight = lastLabelWidth / 2 + 3;
+ }
} else {
// A vertical axis is more constrained by the width. Labels are the dominant factor here, so get that length first
- var maxLabelWidth = me.maxWidth - minSize.width;
-
// Account for padding
- var mirror = tickOpts.mirror;
- if (!mirror) {
- largestTextWidth += me.options.ticks.padding;
- } else {
- // If mirrored text is on the inside so don't expand
- largestTextWidth = 0;
- }
- if (largestTextWidth < maxLabelWidth) {
- // We don't need all the room
- minSize.width += largestTextWidth;
+ if (tickOpts.mirror) {
+ largestTextWidth = 0;
} else {
- // Expand to max size
- minSize.width = me.maxWidth;
+ largestTextWidth += me.options.ticks.padding;
}
-
- me.paddingTop = tickFontSize / 2;
- me.paddingBottom = tickFontSize / 2;
+ minSize.width += largestTextWidth;
+ me.paddingTop = tickFont.size / 2;
+ me.paddingBottom = tickFont.size / 2;
}
}
+ me.handleMargins();
+
+ me.width = minSize.width;
+ me.height = minSize.height;
+ },
+
+ /**
+ * Handle margins and padding interactions
+ * @private
+ */
+ handleMargins: function() {
+ var me = this;
if (me.margins) {
me.paddingLeft = Math.max(me.paddingLeft - me.margins.left, 0);
me.paddingTop = Math.max(me.paddingTop - me.margins.top, 0);
me.paddingRight = Math.max(me.paddingRight - me.margins.right, 0);
me.paddingBottom = Math.max(me.paddingBottom - me.margins.bottom, 0);
}
-
- me.width = minSize.width;
- me.height = minSize.height;
-
},
+
afterFit: function() {
helpers.callCallback(this.options.afterFit, [this]);
},
// Shared Methods
isHorizontal: function() {
- return this.options.position === "top" || this.options.position === "bottom";
+ return this.options.position === 'top' || this.options.position === 'bottom';
},
isFullWidth: function() {
return (this.options.fullWidth);
@@ -7236,17 +7963,16 @@ module.exports = function(Chart) {
if (rawValue === null || typeof(rawValue) === 'undefined') {
return NaN;
}
- // isNaN(object) returns true, so make sure NaN is checking for a number
- if (typeof(rawValue) === 'number' && isNaN(rawValue)) {
+ // isNaN(object) returns true, so make sure NaN is checking for a number; Discard Infinite values
+ if (typeof(rawValue) === 'number' && !isFinite(rawValue)) {
return NaN;
}
// If it is in fact an object, dive in one more level
- if (typeof(rawValue) === "object") {
+ if (typeof(rawValue) === 'object') {
if ((rawValue instanceof Date) || (rawValue.isValid)) {
return rawValue;
- } else {
- return this.getRightValue(this.isHorizontal() ? rawValue.x : rawValue.y);
}
+ return this.getRightValue(this.isHorizontal() ? rawValue.x : rawValue.y);
}
// Value is good, return it
@@ -7278,14 +8004,13 @@ module.exports = function(Chart) {
var finalVal = me.left + Math.round(pixel);
finalVal += me.isFullWidth() ? me.margins.left : 0;
return finalVal;
- } else {
- var innerHeight = me.height - (me.paddingTop + me.paddingBottom);
- return me.top + (index * (innerHeight / (me.ticks.length - 1)));
}
+ var innerHeight = me.height - (me.paddingTop + me.paddingBottom);
+ return me.top + (index * (innerHeight / (me.ticks.length - 1)));
},
// Utility for getting the pixel location of a percentage of scale
- getPixelForDecimal: function(decimal /*, includeOffset*/ ) {
+ getPixelForDecimal: function(decimal /* , includeOffset*/) {
var me = this;
if (me.isHorizontal()) {
var innerWidth = me.width - (me.paddingLeft + me.paddingRight);
@@ -7294,24 +8019,26 @@ module.exports = function(Chart) {
var finalVal = me.left + Math.round(valueOffset);
finalVal += me.isFullWidth() ? me.margins.left : 0;
return finalVal;
- } else {
- return me.top + (decimal * me.height);
}
+ return me.top + (decimal * me.height);
},
getBasePixel: function() {
+ return this.getPixelForValue(this.getBaseValue());
+ },
+
+ getBaseValue: function() {
var me = this;
var min = me.min;
var max = me.max;
- return me.getPixelForValue(
- me.beginAtZero? 0:
+ return me.beginAtZero ? 0:
min < 0 && max < 0? max :
min > 0 && max > 0? min :
- 0);
+ 0;
},
- // Actualy draw the scale on the canvas
+ // Actually draw the scale on the canvas
// @param {rectangle} chartArea : the area of the chart to draw full grid lines on
draw: function(chartArea) {
var me = this;
@@ -7338,19 +8065,14 @@ module.exports = function(Chart) {
}
var tickFontColor = helpers.getValueOrDefault(optionTicks.fontColor, globalDefaults.defaultFontColor);
- var tickFontSize = helpers.getValueOrDefault(optionTicks.fontSize, globalDefaults.defaultFontSize);
- var tickFontStyle = helpers.getValueOrDefault(optionTicks.fontStyle, globalDefaults.defaultFontStyle);
- var tickFontFamily = helpers.getValueOrDefault(optionTicks.fontFamily, globalDefaults.defaultFontFamily);
- var tickLabelFont = helpers.fontString(tickFontSize, tickFontStyle, tickFontFamily);
- var tl = gridLines.tickMarkLength;
+ var tickFont = parseFontOptions(optionTicks);
+
+ var tl = gridLines.drawTicks ? gridLines.tickMarkLength : 0;
var borderDash = helpers.getValueOrDefault(gridLines.borderDash, globalDefaults.borderDash);
var borderDashOffset = helpers.getValueOrDefault(gridLines.borderDashOffset, globalDefaults.borderDashOffset);
var scaleLabelFontColor = helpers.getValueOrDefault(scaleLabel.fontColor, globalDefaults.defaultFontColor);
- var scaleLabelFontSize = helpers.getValueOrDefault(scaleLabel.fontSize, globalDefaults.defaultFontSize);
- var scaleLabelFontStyle = helpers.getValueOrDefault(scaleLabel.fontStyle, globalDefaults.defaultFontStyle);
- var scaleLabelFontFamily = helpers.getValueOrDefault(scaleLabel.fontFamily, globalDefaults.defaultFontFamily);
- var scaleLabelFont = helpers.fontString(scaleLabelFontSize, scaleLabelFontStyle, scaleLabelFontFamily);
+ var scaleLabelFont = parseFontOptions(scaleLabel);
var labelRotationRadians = helpers.toRadians(me.labelRotation);
var cosRotation = Math.cos(labelRotationRadians);
@@ -7391,10 +8113,10 @@ module.exports = function(Chart) {
}
- var xTickStart = options.position === "right" ? me.left : me.right - tl;
- var xTickEnd = options.position === "right" ? me.left + tl : me.right;
- var yTickStart = options.position === "bottom" ? me.top : me.bottom - tl;
- var yTickEnd = options.position === "bottom" ? me.top + tl : me.bottom;
+ var xTickStart = options.position === 'right' ? me.left : me.right - tl;
+ var xTickEnd = options.position === 'right' ? me.left + tl : me.right;
+ var yTickStart = options.position === 'bottom' ? me.top : me.bottom - tl;
+ var yTickEnd = options.position === 'bottom' ? me.top + tl : me.bottom;
helpers.each(me.ticks, function(label, index) {
// If the callback returned a null or undefined value, do not draw this line
@@ -7415,25 +8137,32 @@ module.exports = function(Chart) {
// Draw the first index specially
lineWidth = gridLines.zeroLineWidth;
lineColor = gridLines.zeroLineColor;
- } else {
+ } else {
lineWidth = helpers.getValueAtIndexOrDefault(gridLines.lineWidth, index);
lineColor = helpers.getValueAtIndexOrDefault(gridLines.color, index);
}
// Common properties
var tx1, ty1, tx2, ty2, x1, y1, x2, y2, labelX, labelY;
- var textAlign, textBaseline = 'middle';
+ var textAlign = 'middle';
+ var textBaseline = 'middle';
if (isHorizontal) {
- if (!isRotated) {
- textBaseline = options.position === 'top' ? 'bottom' : 'top';
- }
- textAlign = isRotated ? 'right' : 'center';
+ if (options.position === 'bottom') {
+ // bottom
+ textBaseline = !isRotated? 'top':'middle';
+ textAlign = !isRotated? 'center': 'right';
+ labelY = me.top + tl;
+ } else {
+ // top
+ textBaseline = !isRotated? 'bottom':'middle';
+ textAlign = !isRotated? 'center': 'left';
+ labelY = me.bottom - tl;
+ }
var xLineValue = me.getPixelForTick(index) + helpers.aliasPixel(lineWidth); // xvalues for grid lines
labelX = me.getPixelForTick(index, gridLines.offsetGridLines) + optionTicks.labelOffset; // x values for optionTicks (need to consider offsetLabel option)
- labelY = (isRotated) ? me.top + 12 : options.position === 'top' ? me.bottom - tl : me.top + tl;
tx1 = tx2 = x1 = x2 = xLineValue;
ty1 = yTickStart;
@@ -7441,25 +8170,20 @@ module.exports = function(Chart) {
y1 = chartArea.top;
y2 = chartArea.bottom;
} else {
- if (options.position === 'left') {
- if (optionTicks.mirror) {
- labelX = me.right + optionTicks.padding;
- textAlign = 'left';
- } else {
- labelX = me.right - optionTicks.padding;
- textAlign = 'right';
- }
+ var isLeft = options.position === 'left';
+ var tickPadding = optionTicks.padding;
+ var labelXOffset;
+
+ if (optionTicks.mirror) {
+ textAlign = isLeft ? 'left' : 'right';
+ labelXOffset = tickPadding;
} else {
- // right side
- if (optionTicks.mirror) {
- labelX = me.left - optionTicks.padding;
- textAlign = 'right';
- } else {
- labelX = me.left + optionTicks.padding;
- textAlign = 'left';
- }
+ textAlign = isLeft ? 'right' : 'left';
+ labelXOffset = tl + tickPadding;
}
+ labelX = isLeft ? me.right - labelXOffset : me.left + labelXOffset;
+
var yLineValue = me.getPixelForTick(index); // xvalues for grid lines
yLineValue += helpers.aliasPixel(lineWidth);
labelY = me.getPixelForTick(index, gridLines.offsetGridLines);
@@ -7524,7 +8248,7 @@ module.exports = function(Chart) {
context.save();
context.translate(itemToDraw.labelX, itemToDraw.labelY);
context.rotate(itemToDraw.rotation);
- context.font = tickLabelFont;
+ context.font = tickFont.font;
context.textBaseline = itemToDraw.textBaseline;
context.textAlign = itemToDraw.textAlign;
@@ -7534,7 +8258,7 @@ module.exports = function(Chart) {
// We just make sure the multiline element is a string here..
context.fillText('' + label[i], 0, y);
// apply same lineSpacing as calculated @ L#320
- y += (tickFontSize * 1.5);
+ y += (tickFont.size * 1.5);
}
} else {
context.fillText(label, 0, 0);
@@ -7551,10 +8275,10 @@ module.exports = function(Chart) {
if (isHorizontal) {
scaleLabelX = me.left + ((me.right - me.left) / 2); // midpoint of the width
- scaleLabelY = options.position === 'bottom' ? me.bottom - (scaleLabelFontSize / 2) : me.top + (scaleLabelFontSize / 2);
+ scaleLabelY = options.position === 'bottom' ? me.bottom - (scaleLabelFont.size / 2) : me.top + (scaleLabelFont.size / 2);
} else {
var isLeft = options.position === 'left';
- scaleLabelX = isLeft ? me.left + (scaleLabelFontSize / 2) : me.right - (scaleLabelFontSize / 2);
+ scaleLabelX = isLeft ? me.left + (scaleLabelFont.size / 2) : me.right - (scaleLabelFont.size / 2);
scaleLabelY = me.top + ((me.bottom - me.top) / 2);
rotation = isLeft ? -0.5 * Math.PI : 0.5 * Math.PI;
}
@@ -7565,7 +8289,7 @@ module.exports = function(Chart) {
context.textAlign = 'center';
context.textBaseline = 'middle';
context.fillStyle = scaleLabelFontColor; // render in correct colour
- context.font = scaleLabelFont;
+ context.font = scaleLabelFont.font;
context.fillText(scaleLabel.labelString, 0, 0);
context.restore();
}
@@ -7599,8 +8323,8 @@ module.exports = function(Chart) {
});
};
-},{}],32:[function(require,module,exports){
-"use strict";
+},{}],33:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -7640,8 +8364,219 @@ module.exports = function(Chart) {
}
};
};
-},{}],33:[function(require,module,exports){
-"use strict";
+
+},{}],34:[function(require,module,exports){
+'use strict';
+
+module.exports = function(Chart) {
+
+ var helpers = Chart.helpers;
+
+ /**
+ * Namespace to hold static tick generation functions
+ * @namespace Chart.Ticks
+ */
+ Chart.Ticks = {
+ /**
+ * Namespace to hold generators for different types of ticks
+ * @namespace Chart.Ticks.generators
+ */
+ generators: {
+ /**
+ * Interface for the options provided to the numeric tick generator
+ * @interface INumericTickGenerationOptions
+ */
+ /**
+ * The maximum number of ticks to display
+ * @name INumericTickGenerationOptions#maxTicks
+ * @type Number
+ */
+ /**
+ * The distance between each tick.
+ * @name INumericTickGenerationOptions#stepSize
+ * @type Number
+ * @optional
+ */
+ /**
+ * Forced minimum for the ticks. If not specified, the minimum of the data range is used to calculate the tick minimum
+ * @name INumericTickGenerationOptions#min
+ * @type Number
+ * @optional
+ */
+ /**
+ * The maximum value of the ticks. If not specified, the maximum of the data range is used to calculate the tick maximum
+ * @name INumericTickGenerationOptions#max
+ * @type Number
+ * @optional
+ */
+
+ /**
+ * Generate a set of linear ticks
+ * @method Chart.Ticks.generators.linear
+ * @param generationOptions {INumericTickGenerationOptions} the options used to generate the ticks
+ * @param dataRange {IRange} the range of the data
+ * @returns {Array<Number>} array of tick values
+ */
+ linear: function(generationOptions, dataRange) {
+ var ticks = [];
+ // To get a "nice" value for the tick spacing, we will use the appropriately named
+ // "nice number" algorithm. See http://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
+ // for details.
+
+ var spacing;
+ if (generationOptions.stepSize && generationOptions.stepSize > 0) {
+ spacing = generationOptions.stepSize;
+ } else {
+ var niceRange = helpers.niceNum(dataRange.max - dataRange.min, false);
+ spacing = helpers.niceNum(niceRange / (generationOptions.maxTicks - 1), true);
+ }
+ var niceMin = Math.floor(dataRange.min / spacing) * spacing;
+ var niceMax = Math.ceil(dataRange.max / spacing) * spacing;
+
+ // If min, max and stepSize is set and they make an evenly spaced scale use it.
+ if (generationOptions.min && generationOptions.max && generationOptions.stepSize) {
+ // If very close to our whole number, use it.
+ if (helpers.almostWhole((generationOptions.max - generationOptions.min) / generationOptions.stepSize, spacing / 1000)) {
+ niceMin = generationOptions.min;
+ niceMax = generationOptions.max;
+ }
+ }
+
+ var numSpaces = (niceMax - niceMin) / spacing;
+ // If very close to our rounded value, use it.
+ if (helpers.almostEquals(numSpaces, Math.round(numSpaces), spacing / 1000)) {
+ numSpaces = Math.round(numSpaces);
+ } else {
+ numSpaces = Math.ceil(numSpaces);
+ }
+
+ // Put the values into the ticks array
+ ticks.push(generationOptions.min !== undefined ? generationOptions.min : niceMin);
+ for (var j = 1; j < numSpaces; ++j) {
+ ticks.push(niceMin + (j * spacing));
+ }
+ ticks.push(generationOptions.max !== undefined ? generationOptions.max : niceMax);
+
+ return ticks;
+ },
+
+ /**
+ * Generate a set of logarithmic ticks
+ * @method Chart.Ticks.generators.logarithmic
+ * @param generationOptions {INumericTickGenerationOptions} the options used to generate the ticks
+ * @param dataRange {IRange} the range of the data
+ * @returns {Array<Number>} array of tick values
+ */
+ logarithmic: function(generationOptions, dataRange) {
+ var ticks = [];
+ var getValueOrDefault = helpers.getValueOrDefault;
+
+ // Figure out what the max number of ticks we can support it is based on the size of
+ // the axis area. For now, we say that the minimum tick spacing in pixels must be 50
+ // We also limit the maximum number of ticks to 11 which gives a nice 10 squares on
+ // the graph
+ var tickVal = getValueOrDefault(generationOptions.min, Math.pow(10, Math.floor(helpers.log10(dataRange.min))));
+
+ var endExp = Math.floor(helpers.log10(dataRange.max));
+ var endSignificand = Math.ceil(dataRange.max / Math.pow(10, endExp));
+ var exp;
+ var significand;
+
+ if (tickVal === 0) {
+ exp = Math.floor(helpers.log10(dataRange.minNotZero));
+ significand = Math.floor(dataRange.minNotZero / Math.pow(10, exp));
+
+ ticks.push(tickVal);
+ tickVal = significand * Math.pow(10, exp);
+ } else {
+ exp = Math.floor(helpers.log10(tickVal));
+ significand = Math.floor(tickVal / Math.pow(10, exp));
+ }
+
+ do {
+ ticks.push(tickVal);
+
+ ++significand;
+ if (significand === 10) {
+ significand = 1;
+ ++exp;
+ }
+
+ tickVal = significand * Math.pow(10, exp);
+ } while (exp < endExp || (exp === endExp && significand < endSignificand));
+
+ var lastTick = getValueOrDefault(generationOptions.max, tickVal);
+ ticks.push(lastTick);
+
+ return ticks;
+ }
+ },
+
+ /**
+ * Namespace to hold formatters for different types of ticks
+ * @namespace Chart.Ticks.formatters
+ */
+ formatters: {
+ /**
+ * Formatter for value labels
+ * @method Chart.Ticks.formatters.values
+ * @param value the value to display
+ * @return {String|Array} the label to display
+ */
+ values: function(value) {
+ return helpers.isArray(value) ? value : '' + value;
+ },
+
+ /**
+ * Formatter for linear numeric ticks
+ * @method Chart.Ticks.formatters.linear
+ * @param tickValue {Number} the value to be formatted
+ * @param index {Number} the position of the tickValue parameter in the ticks array
+ * @param ticks {Array<Number>} the list of ticks being converted
+ * @return {String} string representation of the tickValue parameter
+ */
+ linear: function(tickValue, index, ticks) {
+ // If we have lots of ticks, don't use the ones
+ var delta = ticks.length > 3 ? ticks[2] - ticks[1] : ticks[1] - ticks[0];
+
+ // If we have a number like 2.5 as the delta, figure out how many decimal places we need
+ if (Math.abs(delta) > 1) {
+ if (tickValue !== Math.floor(tickValue)) {
+ // not an integer
+ delta = tickValue - Math.floor(tickValue);
+ }
+ }
+
+ var logDelta = helpers.log10(Math.abs(delta));
+ var tickString = '';
+
+ if (tickValue !== 0) {
+ var numDecimal = -1 * Math.floor(logDelta);
+ numDecimal = Math.max(Math.min(numDecimal, 20), 0); // toFixed has a max of 20 decimal places
+ tickString = tickValue.toFixed(numDecimal);
+ } else {
+ tickString = '0'; // never show decimal places for 0
+ }
+
+ return tickString;
+ },
+
+ logarithmic: function(tickValue, index, ticks) {
+ var remain = tickValue / (Math.pow(10, Math.floor(helpers.log10(tickValue))));
+
+ if (tickValue === 0) {
+ return '0';
+ } else if (remain === 1 || remain === 2 || remain === 5 || index === 0 || index === ticks.length - 1) {
+ return tickValue.toExponential();
+ }
+ return '';
+ }
+ }
+ };
+};
+
+},{}],35:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -7665,20 +8600,14 @@ module.exports = function(Chart) {
initialize: function(config) {
var me = this;
helpers.extend(me, config);
- me.options = helpers.configMerge(Chart.defaults.global.title, config.options);
// Contains hit boxes for each dataset (in dataset order)
me.legendHitBoxes = [];
},
- // These methods are ordered by lifecyle. Utilities then follow.
+ // These methods are ordered by lifecycle. Utilities then follow.
- beforeUpdate: function () {
- var chartOpts = this.chart.options;
- if (chartOpts && chartOpts.title) {
- this.options = helpers.configMerge(Chart.defaults.global.title, chartOpts.title);
- }
- },
+ beforeUpdate: noop,
update: function(maxWidth, maxHeight, margins) {
var me = this;
@@ -7779,10 +8708,10 @@ module.exports = function(Chart) {
// Shared Methods
isHorizontal: function() {
var pos = this.options.position;
- return pos === "top" || pos === "bottom";
+ return pos === 'top' || pos === 'bottom';
},
- // Actualy draw the title block on the canvas
+ // Actually draw the title block on the canvas
draw: function() {
var me = this,
ctx = me.ctx,
@@ -7801,7 +8730,8 @@ module.exports = function(Chart) {
top = me.top,
left = me.left,
bottom = me.bottom,
- right = me.right;
+ right = me.right,
+ maxWidth;
ctx.fillStyle = valueOrDefault(opts.fontColor, globalDefaults.defaultFontColor); // render in correct colour
ctx.font = titleFont;
@@ -7810,9 +8740,11 @@ module.exports = function(Chart) {
if (me.isHorizontal()) {
titleX = left + ((right - left) / 2); // midpoint of the width
titleY = top + ((bottom - top) / 2); // midpoint of the height
+ maxWidth = right - left;
} else {
titleX = opts.position === 'left' ? left + (fontSize / 2) : right - (fontSize / 2);
titleY = top + ((bottom - top) / 2);
+ maxWidth = bottom - top;
rotation = Math.PI * (opts.position === 'left' ? -0.5 : 0.5);
}
@@ -7821,63 +8753,91 @@ module.exports = function(Chart) {
ctx.rotate(rotation);
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
- ctx.fillText(opts.text, 0, 0);
+ ctx.fillText(opts.text, 0, 0, maxWidth);
ctx.restore();
}
}
});
+ function createNewTitleBlockAndAttach(chartInstance, titleOpts) {
+ var title = new Chart.Title({
+ ctx: chartInstance.chart.ctx,
+ options: titleOpts,
+ chart: chartInstance
+ });
+ chartInstance.titleBlock = title;
+ Chart.layoutService.addBox(chartInstance, title);
+ }
+
// Register the title plugin
Chart.plugins.register({
beforeInit: function(chartInstance) {
- var opts = chartInstance.options;
- var titleOpts = opts.title;
+ var titleOpts = chartInstance.options.title;
if (titleOpts) {
- chartInstance.titleBlock = new Chart.Title({
- ctx: chartInstance.chart.ctx,
- options: titleOpts,
- chart: chartInstance
- });
+ createNewTitleBlockAndAttach(chartInstance, titleOpts);
+ }
+ },
+ beforeUpdate: function(chartInstance) {
+ var titleOpts = chartInstance.options.title;
+
+ if (titleOpts) {
+ titleOpts = helpers.configMerge(Chart.defaults.global.title, titleOpts);
- Chart.layoutService.addBox(chartInstance, chartInstance.titleBlock);
+ if (chartInstance.titleBlock) {
+ chartInstance.titleBlock.options = titleOpts;
+ } else {
+ createNewTitleBlockAndAttach(chartInstance, titleOpts);
+ }
+ } else {
+ Chart.layoutService.removeBox(chartInstance, chartInstance.titleBlock);
+ delete chartInstance.titleBlock;
}
}
});
};
-},{}],34:[function(require,module,exports){
-"use strict";
+},{}],36:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
var helpers = Chart.helpers;
+ /**
+ * Helper method to merge the opacity into a color
+ */
+ function mergeOpacity(colorString, opacity) {
+ var color = helpers.color(colorString);
+ return color.alpha(opacity * color.alpha()).rgbaString();
+ }
+
Chart.defaults.global.tooltips = {
enabled: true,
custom: null,
- mode: 'single',
- backgroundColor: "rgba(0,0,0,0.8)",
- titleFontStyle: "bold",
+ mode: 'nearest',
+ position: 'average',
+ intersect: true,
+ backgroundColor: 'rgba(0,0,0,0.8)',
+ titleFontStyle: 'bold',
titleSpacing: 2,
titleMarginBottom: 6,
- titleFontColor: "#fff",
- titleAlign: "left",
+ titleFontColor: '#fff',
+ titleAlign: 'left',
bodySpacing: 2,
- bodyFontColor: "#fff",
- bodyAlign: "left",
- footerFontStyle: "bold",
+ bodyFontColor: '#fff',
+ bodyAlign: 'left',
+ footerFontStyle: 'bold',
footerSpacing: 2,
footerMarginTop: 6,
- footerFontColor: "#fff",
- footerAlign: "left",
+ footerFontColor: '#fff',
+ footerAlign: 'left',
yPadding: 6,
xPadding: 6,
- yAlign : 'center',
- xAlign : 'center',
caretSize: 5,
cornerRadius: 6,
multiKeyBackground: '#fff',
+ displayColors: true,
callbacks: {
// Args are: (tooltipItems, data)
beforeTitle: helpers.noop,
@@ -7935,7 +8895,7 @@ module.exports = function(Chart) {
function pushOrConcat(base, toPush) {
if (toPush) {
if (helpers.isArray(toPush)) {
- //base = base.concat(toPush);
+ // base = base.concat(toPush);
Array.prototype.push.apply(base, toPush);
} else {
base.push(toPush);
@@ -7945,105 +8905,268 @@ module.exports = function(Chart) {
return base;
}
- function getAveragePosition(elements) {
- if (!elements.length) {
- return false;
+ // Private helper to create a tooltip item model
+ // @param element : the chart element (point, arc, bar) to create the tooltip item for
+ // @return : new tooltip item
+ function createTooltipItem(element) {
+ var xScale = element._xScale;
+ var yScale = element._yScale || element._scale; // handle radar || polarArea charts
+ var index = element._index,
+ datasetIndex = element._datasetIndex;
+
+ return {
+ xLabel: xScale ? xScale.getLabelForIndex(index, datasetIndex) : '',
+ yLabel: yScale ? yScale.getLabelForIndex(index, datasetIndex) : '',
+ index: index,
+ datasetIndex: datasetIndex,
+ x: element._model.x,
+ y: element._model.y
+ };
+ }
+
+ /**
+ * Helper to get the reset model for the tooltip
+ * @param tooltipOpts {Object} the tooltip options
+ */
+ function getBaseModel(tooltipOpts) {
+ var globalDefaults = Chart.defaults.global;
+ var getValueOrDefault = helpers.getValueOrDefault;
+
+ return {
+ // Positioning
+ xPadding: tooltipOpts.xPadding,
+ yPadding: tooltipOpts.yPadding,
+ xAlign: tooltipOpts.xAlign,
+ yAlign: tooltipOpts.yAlign,
+
+ // Body
+ bodyFontColor: tooltipOpts.bodyFontColor,
+ _bodyFontFamily: getValueOrDefault(tooltipOpts.bodyFontFamily, globalDefaults.defaultFontFamily),
+ _bodyFontStyle: getValueOrDefault(tooltipOpts.bodyFontStyle, globalDefaults.defaultFontStyle),
+ _bodyAlign: tooltipOpts.bodyAlign,
+ bodyFontSize: getValueOrDefault(tooltipOpts.bodyFontSize, globalDefaults.defaultFontSize),
+ bodySpacing: tooltipOpts.bodySpacing,
+
+ // Title
+ titleFontColor: tooltipOpts.titleFontColor,
+ _titleFontFamily: getValueOrDefault(tooltipOpts.titleFontFamily, globalDefaults.defaultFontFamily),
+ _titleFontStyle: getValueOrDefault(tooltipOpts.titleFontStyle, globalDefaults.defaultFontStyle),
+ titleFontSize: getValueOrDefault(tooltipOpts.titleFontSize, globalDefaults.defaultFontSize),
+ _titleAlign: tooltipOpts.titleAlign,
+ titleSpacing: tooltipOpts.titleSpacing,
+ titleMarginBottom: tooltipOpts.titleMarginBottom,
+
+ // Footer
+ footerFontColor: tooltipOpts.footerFontColor,
+ _footerFontFamily: getValueOrDefault(tooltipOpts.footerFontFamily, globalDefaults.defaultFontFamily),
+ _footerFontStyle: getValueOrDefault(tooltipOpts.footerFontStyle, globalDefaults.defaultFontStyle),
+ footerFontSize: getValueOrDefault(tooltipOpts.footerFontSize, globalDefaults.defaultFontSize),
+ _footerAlign: tooltipOpts.footerAlign,
+ footerSpacing: tooltipOpts.footerSpacing,
+ footerMarginTop: tooltipOpts.footerMarginTop,
+
+ // Appearance
+ caretSize: tooltipOpts.caretSize,
+ cornerRadius: tooltipOpts.cornerRadius,
+ backgroundColor: tooltipOpts.backgroundColor,
+ opacity: 0,
+ legendColorBackground: tooltipOpts.multiKeyBackground,
+ displayColors: tooltipOpts.displayColors
+ };
+ }
+
+ /**
+ * Get the size of the tooltip
+ */
+ function getTooltipSize(tooltip, model) {
+ var ctx = tooltip._chart.ctx;
+
+ var height = model.yPadding * 2; // Tooltip Padding
+ var width = 0;
+
+ // Count of all lines in the body
+ var body = model.body;
+ var combinedBodyLength = body.reduce(function(count, bodyItem) {
+ return count + bodyItem.before.length + bodyItem.lines.length + bodyItem.after.length;
+ }, 0);
+ combinedBodyLength += model.beforeBody.length + model.afterBody.length;
+
+ var titleLineCount = model.title.length;
+ var footerLineCount = model.footer.length;
+ var titleFontSize = model.titleFontSize,
+ bodyFontSize = model.bodyFontSize,
+ footerFontSize = model.footerFontSize;
+
+ height += titleLineCount * titleFontSize; // Title Lines
+ height += titleLineCount ? (titleLineCount - 1) * model.titleSpacing : 0; // Title Line Spacing
+ height += titleLineCount ? model.titleMarginBottom : 0; // Title's bottom Margin
+ height += combinedBodyLength * bodyFontSize; // Body Lines
+ height += combinedBodyLength ? (combinedBodyLength - 1) * model.bodySpacing : 0; // Body Line Spacing
+ height += footerLineCount ? model.footerMarginTop : 0; // Footer Margin
+ height += footerLineCount * (footerFontSize); // Footer Lines
+ height += footerLineCount ? (footerLineCount - 1) * model.footerSpacing : 0; // Footer Line Spacing
+
+ // Title width
+ var widthPadding = 0;
+ var maxLineWidth = function(line) {
+ width = Math.max(width, ctx.measureText(line).width + widthPadding);
+ };
+
+ ctx.font = helpers.fontString(titleFontSize, model._titleFontStyle, model._titleFontFamily);
+ helpers.each(model.title, maxLineWidth);
+
+ // Body width
+ ctx.font = helpers.fontString(bodyFontSize, model._bodyFontStyle, model._bodyFontFamily);
+ helpers.each(model.beforeBody.concat(model.afterBody), maxLineWidth);
+
+ // Body lines may include some extra width due to the color box
+ widthPadding = model.displayColors ? (bodyFontSize + 2) : 0;
+ helpers.each(body, function(bodyItem) {
+ helpers.each(bodyItem.before, maxLineWidth);
+ helpers.each(bodyItem.lines, maxLineWidth);
+ helpers.each(bodyItem.after, maxLineWidth);
+ });
+
+ // Reset back to 0
+ widthPadding = 0;
+
+ // Footer width
+ ctx.font = helpers.fontString(footerFontSize, model._footerFontStyle, model._footerFontFamily);
+ helpers.each(model.footer, maxLineWidth);
+
+ // Add padding
+ width += 2 * model.xPadding;
+
+ return {
+ width: width,
+ height: height
+ };
+ }
+
+ /**
+ * Helper to get the alignment of a tooltip given the size
+ */
+ function determineAlignment(tooltip, size) {
+ var model = tooltip._model;
+ var chart = tooltip._chart;
+ var chartArea = tooltip._chartInstance.chartArea;
+ var xAlign = 'center';
+ var yAlign = 'center';
+
+ if (model.y < size.height) {
+ yAlign = 'top';
+ } else if (model.y > (chart.height - size.height)) {
+ yAlign = 'bottom';
}
- var i, len;
- var xPositions = [];
- var yPositions = [];
+ var lf, rf; // functions to determine left, right alignment
+ var olf, orf; // functions to determine if left/right alignment causes tooltip to go outside chart
+ var yf; // function to get the y alignment if the tooltip goes outside of the left or right edges
+ var midX = (chartArea.left + chartArea.right) / 2;
+ var midY = (chartArea.top + chartArea.bottom) / 2;
- for (i = 0, len = elements.length; i < len; ++i) {
- var el = elements[i];
- if (el && el.hasValue()){
- var pos = el.tooltipPosition();
- xPositions.push(pos.x);
- yPositions.push(pos.y);
- }
+ if (yAlign === 'center') {
+ lf = function(x) {
+ return x <= midX;
+ };
+ rf = function(x) {
+ return x > midX;
+ };
+ } else {
+ lf = function(x) {
+ return x <= (size.width / 2);
+ };
+ rf = function(x) {
+ return x >= (chart.width - (size.width / 2));
+ };
}
- var x = 0,
- y = 0;
- for (i = 0; i < xPositions.length; ++i) {
- if (xPositions[ i ]) {
- x += xPositions[i];
- y += yPositions[i];
+ olf = function(x) {
+ return x + size.width > chart.width;
+ };
+ orf = function(x) {
+ return x - size.width < 0;
+ };
+ yf = function(y) {
+ return y <= midY ? 'top' : 'bottom';
+ };
+
+ if (lf(model.x)) {
+ xAlign = 'left';
+
+ // Is tooltip too wide and goes over the right side of the chart.?
+ if (olf(model.x)) {
+ xAlign = 'center';
+ yAlign = yf(model.y);
+ }
+ } else if (rf(model.x)) {
+ xAlign = 'right';
+
+ // Is tooltip too wide and goes outside left edge of canvas?
+ if (orf(model.x)) {
+ xAlign = 'center';
+ yAlign = yf(model.y);
}
}
+ var opts = tooltip._options;
return {
- x: Math.round(x / xPositions.length),
- y: Math.round(y / xPositions.length)
+ xAlign: opts.xAlign ? opts.xAlign : xAlign,
+ yAlign: opts.yAlign ? opts.yAlign : yAlign
};
}
- // Private helper to create a tooltip iteam model
- // @param element : the chart element (point, arc, bar) to create the tooltip item for
- // @return : new tooltip item
- function createTooltipItem(element) {
- var xScale = element._xScale;
- var yScale = element._yScale || element._scale; // handle radar || polarArea charts
- var index = element._index,
- datasetIndex = element._datasetIndex;
+ /**
+ * @Helper to get the location a tooltip needs to be placed at given the initial position (via the vm) and the size and alignment
+ */
+ function getBackgroundPoint(vm, size, alignment) {
+ // Background Position
+ var x = vm.x;
+ var y = vm.y;
+
+ var caretSize = vm.caretSize,
+ caretPadding = vm.caretPadding,
+ cornerRadius = vm.cornerRadius,
+ xAlign = alignment.xAlign,
+ yAlign = alignment.yAlign,
+ paddingAndSize = caretSize + caretPadding,
+ radiusAndPadding = cornerRadius + caretPadding;
+
+ if (xAlign === 'right') {
+ x -= size.width;
+ } else if (xAlign === 'center') {
+ x -= (size.width / 2);
+ }
+
+ if (yAlign === 'top') {
+ y += paddingAndSize;
+ } else if (yAlign === 'bottom') {
+ y -= size.height + paddingAndSize;
+ } else {
+ y -= (size.height / 2);
+ }
+
+ if (yAlign === 'center') {
+ if (xAlign === 'left') {
+ x += paddingAndSize;
+ } else if (xAlign === 'right') {
+ x -= paddingAndSize;
+ }
+ } else if (xAlign === 'left') {
+ x -= radiusAndPadding;
+ } else if (xAlign === 'right') {
+ x += radiusAndPadding;
+ }
return {
- xLabel: xScale ? xScale.getLabelForIndex(index, datasetIndex) : '',
- yLabel: yScale ? yScale.getLabelForIndex(index, datasetIndex) : '',
- index: index,
- datasetIndex: datasetIndex
+ x: x,
+ y: y
};
}
Chart.Tooltip = Chart.Element.extend({
initialize: function() {
- var me = this;
- var globalDefaults = Chart.defaults.global;
- var tooltipOpts = me._options;
- var getValueOrDefault = helpers.getValueOrDefault;
-
- helpers.extend(me, {
- _model: {
- // Positioning
- xPadding: tooltipOpts.xPadding,
- yPadding: tooltipOpts.yPadding,
- xAlign : tooltipOpts.xAlign,
- yAlign : tooltipOpts.yAlign,
-
- // Body
- bodyFontColor: tooltipOpts.bodyFontColor,
- _bodyFontFamily: getValueOrDefault(tooltipOpts.bodyFontFamily, globalDefaults.defaultFontFamily),
- _bodyFontStyle: getValueOrDefault(tooltipOpts.bodyFontStyle, globalDefaults.defaultFontStyle),
- _bodyAlign: tooltipOpts.bodyAlign,
- bodyFontSize: getValueOrDefault(tooltipOpts.bodyFontSize, globalDefaults.defaultFontSize),
- bodySpacing: tooltipOpts.bodySpacing,
-
- // Title
- titleFontColor: tooltipOpts.titleFontColor,
- _titleFontFamily: getValueOrDefault(tooltipOpts.titleFontFamily, globalDefaults.defaultFontFamily),
- _titleFontStyle: getValueOrDefault(tooltipOpts.titleFontStyle, globalDefaults.defaultFontStyle),
- titleFontSize: getValueOrDefault(tooltipOpts.titleFontSize, globalDefaults.defaultFontSize),
- _titleAlign: tooltipOpts.titleAlign,
- titleSpacing: tooltipOpts.titleSpacing,
- titleMarginBottom: tooltipOpts.titleMarginBottom,
-
- // Footer
- footerFontColor: tooltipOpts.footerFontColor,
- _footerFontFamily: getValueOrDefault(tooltipOpts.footerFontFamily, globalDefaults.defaultFontFamily),
- _footerFontStyle: getValueOrDefault(tooltipOpts.footerFontStyle, globalDefaults.defaultFontStyle),
- footerFontSize: getValueOrDefault(tooltipOpts.footerFontSize, globalDefaults.defaultFontSize),
- _footerAlign: tooltipOpts.footerAlign,
- footerSpacing: tooltipOpts.footerSpacing,
- footerMarginTop: tooltipOpts.footerMarginTop,
-
- // Appearance
- caretSize: tooltipOpts.caretSize,
- cornerRadius: tooltipOpts.cornerRadius,
- backgroundColor: tooltipOpts.backgroundColor,
- opacity: 0,
- legendColorBackground: tooltipOpts.multiKeyBackground
- }
- });
+ this._model = getBaseModel(this._options);
},
// Get the title
@@ -8120,236 +9243,110 @@ module.exports = function(Chart) {
update: function(changed) {
var me = this;
var opts = me._options;
- var model = me._model;
+
+ // Need to regenerate the model because its faster than using extend and it is necessary due to the optimization in Chart.Element.transition
+ // that does _view = _model if ease === 1. This causes the 2nd tooltip update to set properties in both the view and model at the same time
+ // which breaks any animations.
+ var existingModel = me._model;
+ var model = me._model = getBaseModel(opts);
var active = me._active;
var data = me._data;
var chartInstance = me._chartInstance;
+ // In the case where active.length === 0 we need to keep these at existing values for good animations
+ var alignment = {
+ xAlign: existingModel.xAlign,
+ yAlign: existingModel.yAlign
+ };
+ var backgroundPoint = {
+ x: existingModel.x,
+ y: existingModel.y
+ };
+ var tooltipSize = {
+ width: existingModel.width,
+ height: existingModel.height
+ };
+ var tooltipPosition = {
+ x: existingModel.caretX,
+ y: existingModel.caretY
+ };
+
var i, len;
if (active.length) {
model.opacity = 1;
- var labelColors = [],
- tooltipPosition = getAveragePosition(active);
+ var labelColors = [];
+ tooltipPosition = Chart.Tooltip.positioners[opts.position](active, me._eventPosition);
var tooltipItems = [];
for (i = 0, len = active.length; i < len; ++i) {
tooltipItems.push(createTooltipItem(active[i]));
}
- // If the user provided a sorting function, use it to modify the tooltip items
- if (opts.itemSort) {
- tooltipItems = tooltipItems.sort(function(a,b) {
- return opts.itemSort(a,b, data);
+ // If the user provided a filter function, use it to modify the tooltip items
+ if (opts.filter) {
+ tooltipItems = tooltipItems.filter(function(a) {
+ return opts.filter(a, data);
});
}
- // If there is more than one item, show color items
- if (active.length > 1) {
- helpers.each(tooltipItems, function(tooltipItem) {
- labelColors.push(opts.callbacks.labelColor.call(me, tooltipItem, chartInstance));
+ // If the user provided a sorting function, use it to modify the tooltip items
+ if (opts.itemSort) {
+ tooltipItems = tooltipItems.sort(function(a, b) {
+ return opts.itemSort(a, b, data);
});
}
- // Build the Text Lines
- helpers.extend(model, {
- title: me.getTitle(tooltipItems, data),
- beforeBody: me.getBeforeBody(tooltipItems, data),
- body: me.getBody(tooltipItems, data),
- afterBody: me.getAfterBody(tooltipItems, data),
- footer: me.getFooter(tooltipItems, data),
- x: Math.round(tooltipPosition.x),
- y: Math.round(tooltipPosition.y),
- caretPadding: helpers.getValueOrDefault(tooltipPosition.padding, 2),
- labelColors: labelColors
+ // Determine colors for boxes
+ helpers.each(tooltipItems, function(tooltipItem) {
+ labelColors.push(opts.callbacks.labelColor.call(me, tooltipItem, chartInstance));
});
- // We need to determine alignment of
- var tooltipSize = me.getTooltipSize(model);
- me.determineAlignment(tooltipSize); // Smart Tooltip placement to stay on the canvas
-
- helpers.extend(model, me.getBackgroundPoint(model, tooltipSize));
+ // Build the Text Lines
+ model.title = me.getTitle(tooltipItems, data);
+ model.beforeBody = me.getBeforeBody(tooltipItems, data);
+ model.body = me.getBody(tooltipItems, data);
+ model.afterBody = me.getAfterBody(tooltipItems, data);
+ model.footer = me.getFooter(tooltipItems, data);
+
+ // Initial positioning and colors
+ model.x = Math.round(tooltipPosition.x);
+ model.y = Math.round(tooltipPosition.y);
+ model.caretPadding = helpers.getValueOrDefault(tooltipPosition.padding, 2);
+ model.labelColors = labelColors;
+
+ // data points
+ model.dataPoints = tooltipItems;
+
+ // We need to determine alignment of the tooltip
+ tooltipSize = getTooltipSize(this, model);
+ alignment = determineAlignment(this, tooltipSize);
+ // Final Size and Position
+ backgroundPoint = getBackgroundPoint(model, tooltipSize, alignment);
} else {
- me._model.opacity = 0;
- }
-
- if (changed && opts.custom) {
- opts.custom.call(me, model);
- }
-
- return me;
- },
- getTooltipSize: function(vm) {
- var ctx = this._chart.ctx;
-
- var size = {
- height: vm.yPadding * 2, // Tooltip Padding
- width: 0
- };
-
- // Count of all lines in the body
- var body = vm.body;
- var combinedBodyLength = body.reduce(function(count, bodyItem) {
- return count + bodyItem.before.length + bodyItem.lines.length + bodyItem.after.length;
- }, 0);
- combinedBodyLength += vm.beforeBody.length + vm.afterBody.length;
-
- var titleLineCount = vm.title.length;
- var footerLineCount = vm.footer.length;
- var titleFontSize = vm.titleFontSize,
- bodyFontSize = vm.bodyFontSize,
- footerFontSize = vm.footerFontSize;
-
- size.height += titleLineCount * titleFontSize; // Title Lines
- size.height += (titleLineCount - 1) * vm.titleSpacing; // Title Line Spacing
- size.height += titleLineCount ? vm.titleMarginBottom : 0; // Title's bottom Margin
- size.height += combinedBodyLength * bodyFontSize; // Body Lines
- size.height += combinedBodyLength ? (combinedBodyLength - 1) * vm.bodySpacing : 0; // Body Line Spacing
- size.height += footerLineCount ? vm.footerMarginTop : 0; // Footer Margin
- size.height += footerLineCount * (footerFontSize); // Footer Lines
- size.height += footerLineCount ? (footerLineCount - 1) * vm.footerSpacing : 0; // Footer Line Spacing
-
- // Title width
- var widthPadding = 0;
- var maxLineWidth = function(line) {
- size.width = Math.max(size.width, ctx.measureText(line).width + widthPadding);
- };
-
- ctx.font = helpers.fontString(titleFontSize, vm._titleFontStyle, vm._titleFontFamily);
- helpers.each(vm.title, maxLineWidth);
-
- // Body width
- ctx.font = helpers.fontString(bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);
- helpers.each(vm.beforeBody.concat(vm.afterBody), maxLineWidth);
-
- // Body lines may include some extra width due to the color box
- widthPadding = body.length > 1 ? (bodyFontSize + 2) : 0;
- helpers.each(body, function(bodyItem) {
- helpers.each(bodyItem.before, maxLineWidth);
- helpers.each(bodyItem.lines, maxLineWidth);
- helpers.each(bodyItem.after, maxLineWidth);
- });
-
- // Reset back to 0
- widthPadding = 0;
-
- // Footer width
- ctx.font = helpers.fontString(footerFontSize, vm._footerFontStyle, vm._footerFontFamily);
- helpers.each(vm.footer, maxLineWidth);
-
- // Add padding
- size.width += 2 * vm.xPadding;
-
- return size;
- },
- determineAlignment: function(size) {
- var me = this;
- var model = me._model;
- var chart = me._chart;
- var chartArea = me._chartInstance.chartArea;
-
- if (model.y < size.height) {
- model.yAlign = 'top';
- } else if (model.y > (chart.height - size.height)) {
- model.yAlign = 'bottom';
+ model.opacity = 0;
}
- var lf, rf; // functions to determine left, right alignment
- var olf, orf; // functions to determine if left/right alignment causes tooltip to go outside chart
- var yf; // function to get the y alignment if the tooltip goes outside of the left or right edges
- var midX = (chartArea.left + chartArea.right) / 2;
- var midY = (chartArea.top + chartArea.bottom) / 2;
-
- if (model.yAlign === 'center') {
- lf = function(x) {
- return x <= midX;
- };
- rf = function(x) {
- return x > midX;
- };
- } else {
- lf = function(x) {
- return x <= (size.width / 2);
- };
- rf = function(x) {
- return x >= (chart.width - (size.width / 2));
- };
- }
+ model.xAlign = alignment.xAlign;
+ model.yAlign = alignment.yAlign;
+ model.x = backgroundPoint.x;
+ model.y = backgroundPoint.y;
+ model.width = tooltipSize.width;
+ model.height = tooltipSize.height;
- olf = function(x) {
- return x + size.width > chart.width;
- };
- orf = function(x) {
- return x - size.width < 0;
- };
- yf = function(y) {
- return y <= midY ? 'top' : 'bottom';
- };
+ // Point where the caret on the tooltip points to
+ model.caretX = tooltipPosition.x;
+ model.caretY = tooltipPosition.y;
- if (lf(model.x)) {
- model.xAlign = 'left';
+ me._model = model;
- // Is tooltip too wide and goes over the right side of the chart.?
- if (olf(model.x)) {
- model.xAlign = 'center';
- model.yAlign = yf(model.y);
- }
- } else if (rf(model.x)) {
- model.xAlign = 'right';
-
- // Is tooltip too wide and goes outside left edge of canvas?
- if (orf(model.x)) {
- model.xAlign = 'center';
- model.yAlign = yf(model.y);
- }
- }
- },
- getBackgroundPoint: function(vm, size) {
- // Background Position
- var pt = {
- x: vm.x,
- y: vm.y
- };
-
- var caretSize = vm.caretSize,
- caretPadding = vm.caretPadding,
- cornerRadius = vm.cornerRadius,
- xAlign = vm.xAlign,
- yAlign = vm.yAlign,
- paddingAndSize = caretSize + caretPadding,
- radiusAndPadding = cornerRadius + caretPadding;
-
- if (xAlign === 'right') {
- pt.x -= size.width;
- } else if (xAlign === 'center') {
- pt.x -= (size.width / 2);
- }
-
- if (yAlign === 'top') {
- pt.y += paddingAndSize;
- } else if (yAlign === 'bottom') {
- pt.y -= size.height + paddingAndSize;
- } else {
- pt.y -= (size.height / 2);
- }
-
- if (yAlign === 'center') {
- if (xAlign === 'left') {
- pt.x += paddingAndSize;
- } else if (xAlign === 'right') {
- pt.x -= paddingAndSize;
- }
- } else {
- if (xAlign === 'left') {
- pt.x -= radiusAndPadding;
- } else if (xAlign === 'right') {
- pt.x += radiusAndPadding;
- }
+ if (changed && opts.custom) {
+ opts.custom.call(me, model);
}
- return pt;
+ return me;
},
drawCaret: function(tooltipPoint, size, opacity) {
var vm = this._view;
@@ -8406,8 +9403,7 @@ module.exports = function(Chart) {
}
}
- var bgColor = helpers.color(vm.backgroundColor);
- ctx.fillStyle = bgColor.alpha(opacity * bgColor.alpha()).rgbString();
+ ctx.fillStyle = mergeOpacity(vm.backgroundColor, opacity);
ctx.beginPath();
ctx.moveTo(x1, y1);
ctx.lineTo(x2, y2);
@@ -8420,13 +9416,12 @@ module.exports = function(Chart) {
if (title.length) {
ctx.textAlign = vm._titleAlign;
- ctx.textBaseline = "top";
+ ctx.textBaseline = 'top';
var titleFontSize = vm.titleFontSize,
titleSpacing = vm.titleSpacing;
- var titleFontColor = helpers.color(vm.titleFontColor);
- ctx.fillStyle = titleFontColor.alpha(opacity * titleFontColor.alpha()).rgbString();
+ ctx.fillStyle = mergeOpacity(vm.titleFontColor, opacity);
ctx.font = helpers.fontString(titleFontSize, vm._titleFontStyle, vm._titleFontFamily);
var i, len;
@@ -8446,10 +9441,9 @@ module.exports = function(Chart) {
var body = vm.body;
ctx.textAlign = vm._bodyAlign;
- ctx.textBaseline = "top";
+ ctx.textBaseline = 'top';
- var bodyFontColor = helpers.color(vm.bodyFontColor);
- var textColor = bodyFontColor.alpha(opacity * bodyFontColor.alpha()).rgbString();
+ var textColor = mergeOpacity(vm.bodyFontColor, opacity);
ctx.fillStyle = textColor;
ctx.font = helpers.fontString(bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);
@@ -8463,7 +9457,7 @@ module.exports = function(Chart) {
// Before body lines
helpers.each(vm.beforeBody, fillLineOfText);
- var drawColorBoxes = body.length > 1;
+ var drawColorBoxes = vm.displayColors;
xLinePadding = drawColorBoxes ? (bodyFontSize + 2) : 0;
// Draw body lines now
@@ -8474,15 +9468,15 @@ module.exports = function(Chart) {
// Draw Legend-like boxes if needed
if (drawColorBoxes) {
// Fill a white rect so that colours merge nicely if the opacity is < 1
- ctx.fillStyle = helpers.color(vm.legendColorBackground).alpha(opacity).rgbaString();
+ ctx.fillStyle = mergeOpacity(vm.legendColorBackground, opacity);
ctx.fillRect(pt.x, pt.y, bodyFontSize, bodyFontSize);
// Border
- ctx.strokeStyle = helpers.color(vm.labelColors[i].borderColor).alpha(opacity).rgbaString();
+ ctx.strokeStyle = mergeOpacity(vm.labelColors[i].borderColor, opacity);
ctx.strokeRect(pt.x, pt.y, bodyFontSize, bodyFontSize);
// Inner square
- ctx.fillStyle = helpers.color(vm.labelColors[i].backgroundColor).alpha(opacity).rgbaString();
+ ctx.fillStyle = mergeOpacity(vm.labelColors[i].backgroundColor, opacity);
ctx.fillRect(pt.x + 1, pt.y + 1, bodyFontSize - 2, bodyFontSize - 2);
ctx.fillStyle = textColor;
@@ -8508,10 +9502,9 @@ module.exports = function(Chart) {
pt.y += vm.footerMarginTop;
ctx.textAlign = vm._footerAlign;
- ctx.textBaseline = "top";
+ ctx.textBaseline = 'top';
- var footerFontColor = helpers.color(vm.footerFontColor);
- ctx.fillStyle = footerFontColor.alpha(opacity * footerFontColor.alpha()).rgbString();
+ ctx.fillStyle = mergeOpacity(vm.footerFontColor, opacity);
ctx.font = helpers.fontString(vm.footerFontSize, vm._footerFontStyle, vm._footerFontFamily);
helpers.each(footer, function(line) {
@@ -8520,6 +9513,11 @@ module.exports = function(Chart) {
});
}
},
+ drawBackground: function(pt, vm, ctx, tooltipSize, opacity) {
+ ctx.fillStyle = mergeOpacity(vm.backgroundColor, opacity);
+ helpers.drawRoundedRectangle(ctx, pt.x, pt.y, tooltipSize.width, tooltipSize.height, vm.cornerRadius);
+ ctx.fill();
+ },
draw: function() {
var ctx = this._chart.ctx;
var vm = this._view;
@@ -8528,7 +9526,10 @@ module.exports = function(Chart) {
return;
}
- var tooltipSize = this.getTooltipSize(vm);
+ var tooltipSize = {
+ width: vm.width,
+ height: vm.height
+ };
var pt = {
x: vm.x,
y: vm.y
@@ -8539,10 +9540,7 @@ module.exports = function(Chart) {
if (this._options.enabled) {
// Draw Background
- var bgColor = helpers.color(vm.backgroundColor);
- ctx.fillStyle = bgColor.alpha(opacity * bgColor.alpha()).rgbString();
- helpers.drawRoundedRectangle(ctx, pt.x, pt.y, tooltipSize.width, tooltipSize.height, vm.cornerRadius);
- ctx.fill();
+ this.drawBackground(pt, vm, ctx, tooltipSize, opacity);
// Draw Caret
this.drawCaret(pt, tooltipSize, opacity);
@@ -8557,110 +9555,238 @@ module.exports = function(Chart) {
// Body
this.drawBody(pt, vm, ctx, opacity);
- // Footer
- this.drawFooter(pt, vm, ctx, opacity);
+ // Footer
+ this.drawFooter(pt, vm, ctx, opacity);
+ }
+ },
+
+ /**
+ * Handle an event
+ * @private
+ * @param {IEvent} event - The event to handle
+ * @returns {Boolean} true if the tooltip changed
+ */
+ handleEvent: function(e) {
+ var me = this;
+ var options = me._options;
+ var changed = false;
+
+ me._lastActive = me._lastActive || [];
+
+ // Find Active Elements for tooltips
+ if (e.type === 'mouseout') {
+ me._active = [];
+ } else {
+ me._active = me._chartInstance.getElementsAtEventForMode(e, options.mode, options);
+ }
+
+ // Remember Last Actives
+ changed = !helpers.arrayEquals(me._active, me._lastActive);
+ me._lastActive = me._active;
+
+ if (options.enabled || options.custom) {
+ me._eventPosition = {
+ x: e.x,
+ y: e.y
+ };
+
+ var model = me._model;
+ me.update(true);
+ me.pivot();
+
+ // See if our tooltip position changed
+ changed |= (model.x !== me._model.x) || (model.y !== me._model.y);
+ }
+
+ return changed;
+ }
+ });
+
+ /**
+ * @namespace Chart.Tooltip.positioners
+ */
+ Chart.Tooltip.positioners = {
+ /**
+ * Average mode places the tooltip at the average position of the elements shown
+ * @function Chart.Tooltip.positioners.average
+ * @param elements {ChartElement[]} the elements being displayed in the tooltip
+ * @returns {Point} tooltip position
+ */
+ average: function(elements) {
+ if (!elements.length) {
+ return false;
+ }
+
+ var i, len;
+ var x = 0;
+ var y = 0;
+ var count = 0;
+
+ for (i = 0, len = elements.length; i < len; ++i) {
+ var el = elements[i];
+ if (el && el.hasValue()) {
+ var pos = el.tooltipPosition();
+ x += pos.x;
+ y += pos.y;
+ ++count;
+ }
+ }
+
+ return {
+ x: Math.round(x / count),
+ y: Math.round(y / count)
+ };
+ },
+
+ /**
+ * Gets the tooltip position nearest of the item nearest to the event position
+ * @function Chart.Tooltip.positioners.nearest
+ * @param elements {Chart.Element[]} the tooltip elements
+ * @param eventPosition {Point} the position of the event in canvas coordinates
+ * @returns {Point} the tooltip position
+ */
+ nearest: function(elements, eventPosition) {
+ var x = eventPosition.x;
+ var y = eventPosition.y;
+
+ var nearestElement;
+ var minDistance = Number.POSITIVE_INFINITY;
+ var i, len;
+ for (i = 0, len = elements.length; i < len; ++i) {
+ var el = elements[i];
+ if (el && el.hasValue()) {
+ var center = el.getCenterPoint();
+ var d = helpers.distanceBetweenPoints(eventPosition, center);
+
+ if (d < minDistance) {
+ minDistance = d;
+ nearestElement = el;
+ }
+ }
+ }
+
+ if (nearestElement) {
+ var tp = nearestElement.tooltipPosition();
+ x = tp.x;
+ y = tp.y;
+ }
+
+ return {
+ x: x,
+ y: y
+ };
+ }
+ };
+};
+
+},{}],37:[function(require,module,exports){
+'use strict';
+
+module.exports = function(Chart) {
+
+ var helpers = Chart.helpers,
+ globalOpts = Chart.defaults.global;
+
+ globalOpts.elements.arc = {
+ backgroundColor: globalOpts.defaultColor,
+ borderColor: '#fff',
+ borderWidth: 2
+ };
+
+ Chart.elements.Arc = Chart.Element.extend({
+ inLabelRange: function(mouseX) {
+ var vm = this._view;
+
+ if (vm) {
+ return (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hoverRadius, 2));
+ }
+ return false;
+ },
+ inRange: function(chartX, chartY) {
+ var vm = this._view;
+
+ if (vm) {
+ var pointRelativePosition = helpers.getAngleFromPoint(vm, {
+ x: chartX,
+ y: chartY
+ }),
+ angle = pointRelativePosition.angle,
+ distance = pointRelativePosition.distance;
+
+ // Sanitise angle range
+ var startAngle = vm.startAngle;
+ var endAngle = vm.endAngle;
+ while (endAngle < startAngle) {
+ endAngle += 2.0 * Math.PI;
+ }
+ while (angle > endAngle) {
+ angle -= 2.0 * Math.PI;
+ }
+ while (angle < startAngle) {
+ angle += 2.0 * Math.PI;
+ }
+
+ // Check if within the range of the open/close angle
+ var betweenAngles = (angle >= startAngle && angle <= endAngle),
+ withinRadius = (distance >= vm.innerRadius && distance <= vm.outerRadius);
+
+ return (betweenAngles && withinRadius);
+ }
+ return false;
+ },
+ getCenterPoint: function() {
+ var vm = this._view;
+ var halfAngle = (vm.startAngle + vm.endAngle) / 2;
+ var halfRadius = (vm.innerRadius + vm.outerRadius) / 2;
+ return {
+ x: vm.x + Math.cos(halfAngle) * halfRadius,
+ y: vm.y + Math.sin(halfAngle) * halfRadius
+ };
+ },
+ getArea: function() {
+ var vm = this._view;
+ return Math.PI * ((vm.endAngle - vm.startAngle) / (2 * Math.PI)) * (Math.pow(vm.outerRadius, 2) - Math.pow(vm.innerRadius, 2));
+ },
+ tooltipPosition: function() {
+ var vm = this._view;
+
+ var centreAngle = vm.startAngle + ((vm.endAngle - vm.startAngle) / 2),
+ rangeFromCentre = (vm.outerRadius - vm.innerRadius) / 2 + vm.innerRadius;
+ return {
+ x: vm.x + (Math.cos(centreAngle) * rangeFromCentre),
+ y: vm.y + (Math.sin(centreAngle) * rangeFromCentre)
+ };
+ },
+ draw: function() {
+
+ var ctx = this._chart.ctx,
+ vm = this._view,
+ sA = vm.startAngle,
+ eA = vm.endAngle;
+
+ ctx.beginPath();
+
+ ctx.arc(vm.x, vm.y, vm.outerRadius, sA, eA);
+ ctx.arc(vm.x, vm.y, vm.innerRadius, eA, sA, true);
+
+ ctx.closePath();
+ ctx.strokeStyle = vm.borderColor;
+ ctx.lineWidth = vm.borderWidth;
+
+ ctx.fillStyle = vm.backgroundColor;
+
+ ctx.fill();
+ ctx.lineJoin = 'bevel';
+
+ if (vm.borderWidth) {
+ ctx.stroke();
}
}
});
};
-},{}],35:[function(require,module,exports){
-"use strict";
-
-module.exports = function(Chart) {
-
- var helpers = Chart.helpers,
- globalOpts = Chart.defaults.global;
-
- globalOpts.elements.arc = {
- backgroundColor: globalOpts.defaultColor,
- borderColor: "#fff",
- borderWidth: 2
- };
-
- Chart.elements.Arc = Chart.Element.extend({
- inLabelRange: function(mouseX) {
- var vm = this._view;
-
- if (vm) {
- return (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hoverRadius, 2));
- } else {
- return false;
- }
- },
- inRange: function(chartX, chartY) {
- var vm = this._view;
-
- if (vm) {
- var pointRelativePosition = helpers.getAngleFromPoint(vm, {
- x: chartX,
- y: chartY
- }),
- angle = pointRelativePosition.angle,
- distance = pointRelativePosition.distance;
-
- //Sanitise angle range
- var startAngle = vm.startAngle;
- var endAngle = vm.endAngle;
- while (endAngle < startAngle) {
- endAngle += 2.0 * Math.PI;
- }
- while (angle > endAngle) {
- angle -= 2.0 * Math.PI;
- }
- while (angle < startAngle) {
- angle += 2.0 * Math.PI;
- }
-
- //Check if within the range of the open/close angle
- var betweenAngles = (angle >= startAngle && angle <= endAngle),
- withinRadius = (distance >= vm.innerRadius && distance <= vm.outerRadius);
-
- return (betweenAngles && withinRadius);
- } else {
- return false;
- }
- },
- tooltipPosition: function() {
- var vm = this._view;
-
- var centreAngle = vm.startAngle + ((vm.endAngle - vm.startAngle) / 2),
- rangeFromCentre = (vm.outerRadius - vm.innerRadius) / 2 + vm.innerRadius;
- return {
- x: vm.x + (Math.cos(centreAngle) * rangeFromCentre),
- y: vm.y + (Math.sin(centreAngle) * rangeFromCentre)
- };
- },
- draw: function() {
-
- var ctx = this._chart.ctx,
- vm = this._view,
- sA = vm.startAngle,
- eA = vm.endAngle;
-
- ctx.beginPath();
-
- ctx.arc(vm.x, vm.y, vm.outerRadius, sA, eA);
- ctx.arc(vm.x, vm.y, vm.innerRadius, eA, sA, true);
-
- ctx.closePath();
- ctx.strokeStyle = vm.borderColor;
- ctx.lineWidth = vm.borderWidth;
-
- ctx.fillStyle = vm.backgroundColor;
-
- ctx.fill();
- ctx.lineJoin = 'bevel';
-
- if (vm.borderWidth) {
- ctx.stroke();
- }
- }
- });
-};
-
-},{}],36:[function(require,module,exports){
-"use strict";
+},{}],38:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -8677,7 +9803,7 @@ module.exports = function(Chart) {
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
capBezierPoints: true,
- fill: true // do we fill in the area between the line and its base axis
+ fill: true, // do we fill in the area between the line and its base axis
};
Chart.elements.Line = Chart.Element.extend({
@@ -8685,28 +9811,37 @@ module.exports = function(Chart) {
var me = this;
var vm = me._view;
var spanGaps = vm.spanGaps;
- var scaleZero = vm.scaleZero;
+ var fillPoint = vm.scaleZero;
var loop = me._loop;
+ // Handle different fill modes for cartesian lines
+ if (!loop) {
+ if (vm.fill === 'top') {
+ fillPoint = vm.scaleTop;
+ } else if (vm.fill === 'bottom') {
+ fillPoint = vm.scaleBottom;
+ }
+ }
+
var ctx = me._chart.ctx;
ctx.save();
// Helper function to draw a line to a point
function lineToPoint(previousPoint, point) {
- var vm = point._view;
+ var pointVM = point._view;
if (point._view.steppedLine === true) {
- ctx.lineTo(point._view.x, previousPoint._view.y);
- ctx.lineTo(point._view.x, point._view.y);
+ ctx.lineTo(pointVM.x, previousPoint._view.y);
+ ctx.lineTo(pointVM.x, pointVM.y);
} else if (point._view.tension === 0) {
- ctx.lineTo(vm.x, vm.y);
+ ctx.lineTo(pointVM.x, pointVM.y);
} else {
ctx.bezierCurveTo(
previousPoint._view.controlPointNextX,
previousPoint._view.controlPointNextY,
- vm.controlPointPreviousX,
- vm.controlPointPreviousY,
- vm.x,
- vm.y
+ pointVM.controlPointPreviousX,
+ pointVM.controlPointPreviousY,
+ pointVM.x,
+ pointVM.y
);
}
}
@@ -8733,9 +9868,9 @@ module.exports = function(Chart) {
// First point moves to it's starting position no matter what
if (index === 0) {
if (loop) {
- ctx.moveTo(scaleZero.x, scaleZero.y);
+ ctx.moveTo(fillPoint.x, fillPoint.y);
} else {
- ctx.moveTo(currentVM.x, scaleZero);
+ ctx.moveTo(currentVM.x, fillPoint);
}
if (!currentVM.skip) {
@@ -8749,25 +9884,23 @@ module.exports = function(Chart) {
// Only do this if this is the first point that is skipped
if (!spanGaps && lastDrawnIndex === (index - 1)) {
if (loop) {
- ctx.lineTo(scaleZero.x, scaleZero.y);
+ ctx.lineTo(fillPoint.x, fillPoint.y);
} else {
- ctx.lineTo(previous._view.x, scaleZero);
+ ctx.lineTo(previous._view.x, fillPoint);
}
}
} else {
if (lastDrawnIndex !== (index - 1)) {
- // There was a gap and this is the first point after the gap. If we've never drawn a point, this is a special case.
+ // There was a gap and this is the first point after the gap. If we've never drawn a point, this is a special case.
// If the first data point is NaN, then there is no real gap to skip
if (spanGaps && lastDrawnIndex !== -1) {
// We are spanning the gap, so simple draw a line to this point
lineToPoint(previous, current);
+ } else if (loop) {
+ ctx.lineTo(currentVM.x, currentVM.y);
} else {
- if (loop) {
- ctx.lineTo(currentVM.x, currentVM.y);
- } else {
- ctx.lineTo(currentVM.x, scaleZero);
- ctx.lineTo(currentVM.x, currentVM.y);
- }
+ ctx.lineTo(currentVM.x, fillPoint);
+ ctx.lineTo(currentVM.x, currentVM.y);
}
} else {
// Line to next point
@@ -8779,7 +9912,7 @@ module.exports = function(Chart) {
}
if (!loop && lastDrawnIndex !== -1) {
- ctx.lineTo(points[lastDrawnIndex]._view.x, scaleZero);
+ ctx.lineTo(points[lastDrawnIndex]._view.x, fillPoint);
}
ctx.fillStyle = vm.backgroundColor || globalDefaults.defaultColor;
@@ -8837,8 +9970,9 @@ module.exports = function(Chart) {
}
});
};
-},{}],37:[function(require,module,exports){
-"use strict";
+
+},{}],39:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -8858,14 +9992,35 @@ module.exports = function(Chart) {
hoverBorderWidth: 1
};
+ function xRange(mouseX) {
+ var vm = this._view;
+ return vm ? (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hitRadius, 2)) : false;
+ }
+
+ function yRange(mouseY) {
+ var vm = this._view;
+ return vm ? (Math.pow(mouseY - vm.y, 2) < Math.pow(vm.radius + vm.hitRadius, 2)) : false;
+ }
+
Chart.elements.Point = Chart.Element.extend({
inRange: function(mouseX, mouseY) {
var vm = this._view;
return vm ? ((Math.pow(mouseX - vm.x, 2) + Math.pow(mouseY - vm.y, 2)) < Math.pow(vm.hitRadius + vm.radius, 2)) : false;
},
- inLabelRange: function(mouseX) {
+
+ inLabelRange: xRange,
+ inXRange: xRange,
+ inYRange: yRange,
+
+ getCenterPoint: function() {
var vm = this._view;
- return vm ? (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hitRadius, 2)) : false;
+ return {
+ x: vm.x,
+ y: vm.y
+ };
+ },
+ getArea: function() {
+ return Math.PI * Math.pow(this._view.radius, 2);
},
tooltipPosition: function() {
var vm = this._view;
@@ -8875,13 +10030,17 @@ module.exports = function(Chart) {
padding: vm.radius + vm.borderWidth
};
},
- draw: function() {
+ draw: function(chartArea) {
var vm = this._view;
+ var model = this._model;
var ctx = this._chart.ctx;
var pointStyle = vm.pointStyle;
var radius = vm.radius;
var x = vm.x;
var y = vm.y;
+ var color = Chart.helpers.color;
+ var errMargin = 1.01; // 1.01 is margin for Accumulated error. (Especially Edge, IE.)
+ var ratio = 0;
if (vm.skip) {
return;
@@ -8891,13 +10050,31 @@ module.exports = function(Chart) {
ctx.lineWidth = helpers.getValueOrDefault(vm.borderWidth, globalOpts.elements.point.borderWidth);
ctx.fillStyle = vm.backgroundColor || defaultColor;
+ // Cliping for Points.
+ // going out from inner charArea?
+ if ((chartArea !== undefined) && ((model.x < chartArea.left) || (chartArea.right*errMargin < model.x) || (model.y < chartArea.top) || (chartArea.bottom*errMargin < model.y))) {
+ // Point fade out
+ if (model.x < chartArea.left) {
+ ratio = (x - model.x) / (chartArea.left - model.x);
+ } else if (chartArea.right*errMargin < model.x) {
+ ratio = (model.x - x) / (model.x - chartArea.right);
+ } else if (model.y < chartArea.top) {
+ ratio = (y - model.y) / (chartArea.top - model.y);
+ } else if (chartArea.bottom*errMargin < model.y) {
+ ratio = (model.y - y) / (model.y - chartArea.bottom);
+ }
+ ratio = Math.round(ratio*100) / 100;
+ ctx.strokeStyle = color(ctx.strokeStyle).alpha(ratio).rgbString();
+ ctx.fillStyle = color(ctx.fillStyle).alpha(ratio).rgbString();
+ }
+
Chart.canvasHelpers.drawPoint(ctx, pointStyle, radius, x, y);
}
});
};
-},{}],38:[function(require,module,exports){
-"use strict";
+},{}],40:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -8910,57 +10087,132 @@ module.exports = function(Chart) {
borderSkipped: 'bottom'
};
+ function isVertical(bar) {
+ return bar._view.width !== undefined;
+ }
+
+ /**
+ * Helper function to get the bounds of the bar regardless of the orientation
+ * @private
+ * @param bar {Chart.Element.Rectangle} the bar
+ * @return {Bounds} bounds of the bar
+ */
+ function getBarBounds(bar) {
+ var vm = bar._view;
+ var x1, x2, y1, y2;
+
+ if (isVertical(bar)) {
+ // vertical
+ var halfWidth = vm.width / 2;
+ x1 = vm.x - halfWidth;
+ x2 = vm.x + halfWidth;
+ y1 = Math.min(vm.y, vm.base);
+ y2 = Math.max(vm.y, vm.base);
+ } else {
+ // horizontal bar
+ var halfHeight = vm.height / 2;
+ x1 = Math.min(vm.x, vm.base);
+ x2 = Math.max(vm.x, vm.base);
+ y1 = vm.y - halfHeight;
+ y2 = vm.y + halfHeight;
+ }
+
+ return {
+ left: x1,
+ top: y1,
+ right: x2,
+ bottom: y2
+ };
+ }
+
Chart.elements.Rectangle = Chart.Element.extend({
draw: function() {
var ctx = this._chart.ctx;
var vm = this._view;
-
- var halfWidth = vm.width / 2,
- leftX = vm.x - halfWidth,
- rightX = vm.x + halfWidth,
- top = vm.base - (vm.base - vm.y),
- halfStroke = vm.borderWidth / 2;
+ var left, right, top, bottom, signX, signY, borderSkipped;
+ var borderWidth = vm.borderWidth;
+
+ if (!vm.horizontal) {
+ // bar
+ left = vm.x - vm.width / 2;
+ right = vm.x + vm.width / 2;
+ top = vm.y;
+ bottom = vm.base;
+ signX = 1;
+ signY = bottom > top? 1: -1;
+ borderSkipped = vm.borderSkipped || 'bottom';
+ } else {
+ // horizontal bar
+ left = vm.base;
+ right = vm.x;
+ top = vm.y - vm.height / 2;
+ bottom = vm.y + vm.height / 2;
+ signX = right > left? 1: -1;
+ signY = 1;
+ borderSkipped = vm.borderSkipped || 'left';
+ }
// Canvas doesn't allow us to stroke inside the width so we can
// adjust the sizes to fit if we're setting a stroke on the line
- if (vm.borderWidth) {
- leftX += halfStroke;
- rightX -= halfStroke;
- top += halfStroke;
+ if (borderWidth) {
+ // borderWidth shold be less than bar width and bar height.
+ var barSize = Math.min(Math.abs(left - right), Math.abs(top - bottom));
+ borderWidth = borderWidth > barSize? barSize: borderWidth;
+ var halfStroke = borderWidth / 2;
+ // Adjust borderWidth when bar top position is near vm.base(zero).
+ var borderLeft = left + (borderSkipped !== 'left'? halfStroke * signX: 0);
+ var borderRight = right + (borderSkipped !== 'right'? -halfStroke * signX: 0);
+ var borderTop = top + (borderSkipped !== 'top'? halfStroke * signY: 0);
+ var borderBottom = bottom + (borderSkipped !== 'bottom'? -halfStroke * signY: 0);
+ // not become a vertical line?
+ if (borderLeft !== borderRight) {
+ top = borderTop;
+ bottom = borderBottom;
+ }
+ // not become a horizontal line?
+ if (borderTop !== borderBottom) {
+ left = borderLeft;
+ right = borderRight;
+ }
}
ctx.beginPath();
ctx.fillStyle = vm.backgroundColor;
ctx.strokeStyle = vm.borderColor;
- ctx.lineWidth = vm.borderWidth;
+ ctx.lineWidth = borderWidth;
// Corner points, from bottom-left to bottom-right clockwise
// | 1 2 |
// | 0 3 |
var corners = [
- [leftX, vm.base],
- [leftX, top],
- [rightX, top],
- [rightX, vm.base]
+ [left, bottom],
+ [left, top],
+ [right, top],
+ [right, bottom]
];
// Find first (starting) corner with fallback to 'bottom'
var borders = ['bottom', 'left', 'top', 'right'];
- var startCorner = borders.indexOf(vm.borderSkipped, 0);
- if (startCorner === -1)
+ var startCorner = borders.indexOf(borderSkipped, 0);
+ if (startCorner === -1) {
startCorner = 0;
+ }
function cornerAt(index) {
return corners[(startCorner + index) % 4];
}
// Draw rectangle from 'startCorner'
- ctx.moveTo.apply(ctx, cornerAt(0));
- for (var i = 1; i < 4; i++)
- ctx.lineTo.apply(ctx, cornerAt(i));
+ var corner = cornerAt(0);
+ ctx.moveTo(corner[0], corner[1]);
+
+ for (var i = 1; i < 4; i++) {
+ corner = cornerAt(i);
+ ctx.lineTo(corner[0], corner[1]);
+ }
ctx.fill();
- if (vm.borderWidth) {
+ if (borderWidth) {
ctx.stroke();
}
},
@@ -8969,16 +10221,56 @@ module.exports = function(Chart) {
return vm.base - vm.y;
},
inRange: function(mouseX, mouseY) {
+ var inRange = false;
+
+ if (this._view) {
+ var bounds = getBarBounds(this);
+ inRange = mouseX >= bounds.left && mouseX <= bounds.right && mouseY >= bounds.top && mouseY <= bounds.bottom;
+ }
+
+ return inRange;
+ },
+ inLabelRange: function(mouseX, mouseY) {
+ var me = this;
+ if (!me._view) {
+ return false;
+ }
+
+ var inRange = false;
+ var bounds = getBarBounds(me);
+
+ if (isVertical(me)) {
+ inRange = mouseX >= bounds.left && mouseX <= bounds.right;
+ } else {
+ inRange = mouseY >= bounds.top && mouseY <= bounds.bottom;
+ }
+
+ return inRange;
+ },
+ inXRange: function(mouseX) {
+ var bounds = getBarBounds(this);
+ return mouseX >= bounds.left && mouseX <= bounds.right;
+ },
+ inYRange: function(mouseY) {
+ var bounds = getBarBounds(this);
+ return mouseY >= bounds.top && mouseY <= bounds.bottom;
+ },
+ getCenterPoint: function() {
var vm = this._view;
- return vm ?
- (vm.y < vm.base ?
- (mouseX >= vm.x - vm.width / 2 && mouseX <= vm.x + vm.width / 2) && (mouseY >= vm.y && mouseY <= vm.base) :
- (mouseX >= vm.x - vm.width / 2 && mouseX <= vm.x + vm.width / 2) && (mouseY >= vm.base && mouseY <= vm.y)) :
- false;
+ var x, y;
+ if (isVertical(this)) {
+ x = vm.x;
+ y = (vm.y + vm.base) / 2;
+ } else {
+ x = (vm.x + vm.base) / 2;
+ y = vm.y;
+ }
+
+ return {x: x, y: y};
},
- inLabelRange: function(mouseX) {
+ getArea: function() {
var vm = this._view;
- return vm ? (mouseX >= vm.x - vm.width / 2 && mouseX <= vm.x + vm.width / 2) : false;
+ return vm.width * Math.abs(vm.y - vm.base);
},
tooltipPosition: function() {
var vm = this._view;
@@ -8990,20 +10282,371 @@ module.exports = function(Chart) {
});
};
-},{}],39:[function(require,module,exports){
-"use strict";
+
+},{}],41:[function(require,module,exports){
+'use strict';
+
+// Chart.Platform implementation for targeting a web browser
+module.exports = function(Chart) {
+ var helpers = Chart.helpers;
+
+ // DOM event types -> Chart.js event types.
+ // Note: only events with different types are mapped.
+ // https://developer.mozilla.org/en-US/docs/Web/Events
+ var eventTypeMap = {
+ // Touch events
+ touchstart: 'mousedown',
+ touchmove: 'mousemove',
+ touchend: 'mouseup',
+
+ // Pointer events
+ pointerenter: 'mouseenter',
+ pointerdown: 'mousedown',
+ pointermove: 'mousemove',
+ pointerup: 'mouseup',
+ pointerleave: 'mouseout',
+ pointerout: 'mouseout'
+ };
+
+ /**
+ * The "used" size is the final value of a dimension property after all calculations have
+ * been performed. This method uses the computed style of `element` but returns undefined
+ * if the computed style is not expressed in pixels. That can happen in some cases where
+ * `element` has a size relative to its parent and this last one is not yet displayed,
+ * for example because of `display: none` on a parent node.
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/used_value
+ * @returns {Number} Size in pixels or undefined if unknown.
+ */
+ function readUsedSize(element, property) {
+ var value = helpers.getStyle(element, property);
+ var matches = value && value.match(/(\d+)px/);
+ return matches? Number(matches[1]) : undefined;
+ }
+
+ /**
+ * Initializes the canvas style and render size without modifying the canvas display size,
+ * since responsiveness is handled by the controller.resize() method. The config is used
+ * to determine the aspect ratio to apply in case no explicit height has been specified.
+ */
+ function initCanvas(canvas, config) {
+ var style = canvas.style;
+
+ // NOTE(SB) canvas.getAttribute('width') !== canvas.width: in the first case it
+ // returns null or '' if no explicit value has been set to the canvas attribute.
+ var renderHeight = canvas.getAttribute('height');
+ var renderWidth = canvas.getAttribute('width');
+
+ // Chart.js modifies some canvas values that we want to restore on destroy
+ canvas._chartjs = {
+ initial: {
+ height: renderHeight,
+ width: renderWidth,
+ style: {
+ display: style.display,
+ height: style.height,
+ width: style.width
+ }
+ }
+ };
+
+ // Force canvas to display as block to avoid extra space caused by inline
+ // elements, which would interfere with the responsive resize process.
+ // https://github.com/chartjs/Chart.js/issues/2538
+ style.display = style.display || 'block';
+
+ if (renderWidth === null || renderWidth === '') {
+ var displayWidth = readUsedSize(canvas, 'width');
+ if (displayWidth !== undefined) {
+ canvas.width = displayWidth;
+ }
+ }
+
+ if (renderHeight === null || renderHeight === '') {
+ if (canvas.style.height === '') {
+ // If no explicit render height and style height, let's apply the aspect ratio,
+ // which one can be specified by the user but also by charts as default option
+ // (i.e. options.aspectRatio). If not specified, use canvas aspect ratio of 2.
+ canvas.height = canvas.width / (config.options.aspectRatio || 2);
+ } else {
+ var displayHeight = readUsedSize(canvas, 'height');
+ if (displayWidth !== undefined) {
+ canvas.height = displayHeight;
+ }
+ }
+ }
+
+ return canvas;
+ }
+
+ function createEvent(type, chart, x, y, native) {
+ return {
+ type: type,
+ chart: chart,
+ native: native || null,
+ x: x !== undefined? x : null,
+ y: y !== undefined? y : null,
+ };
+ }
+
+ function fromNativeEvent(event, chart) {
+ var type = eventTypeMap[event.type] || event.type;
+ var pos = helpers.getRelativePosition(event, chart);
+ return createEvent(type, chart, pos.x, pos.y, event);
+ }
+
+ function createResizer(handler) {
+ var iframe = document.createElement('iframe');
+ iframe.className = 'chartjs-hidden-iframe';
+ iframe.style.cssText =
+ 'display:block;'+
+ 'overflow:hidden;'+
+ 'border:0;'+
+ 'margin:0;'+
+ 'top:0;'+
+ 'left:0;'+
+ 'bottom:0;'+
+ 'right:0;'+
+ 'height:100%;'+
+ 'width:100%;'+
+ 'position:absolute;'+
+ 'pointer-events:none;'+
+ 'z-index:-1;';
+
+ // Prevent the iframe to gain focus on tab.
+ // https://github.com/chartjs/Chart.js/issues/3090
+ iframe.tabIndex = -1;
+
+ // If the iframe is re-attached to the DOM, the resize listener is removed because the
+ // content is reloaded, so make sure to install the handler after the iframe is loaded.
+ // https://github.com/chartjs/Chart.js/issues/3521
+ helpers.addEvent(iframe, 'load', function() {
+ helpers.addEvent(iframe.contentWindow || iframe, 'resize', handler);
+
+ // The iframe size might have changed while loading, which can also
+ // happen if the size has been changed while detached from the DOM.
+ handler();
+ });
+
+ return iframe;
+ }
+
+ function addResizeListener(node, listener, chart) {
+ var stub = node._chartjs = {
+ ticking: false
+ };
+
+ // Throttle the callback notification until the next animation frame.
+ var notify = function() {
+ if (!stub.ticking) {
+ stub.ticking = true;
+ helpers.requestAnimFrame.call(window, function() {
+ if (stub.resizer) {
+ stub.ticking = false;
+ return listener(createEvent('resize', chart));
+ }
+ });
+ }
+ };
+
+ // Let's keep track of this added iframe and thus avoid DOM query when removing it.
+ stub.resizer = createResizer(notify);
+
+ node.insertBefore(stub.resizer, node.firstChild);
+ }
+
+ function removeResizeListener(node) {
+ if (!node || !node._chartjs) {
+ return;
+ }
+
+ var resizer = node._chartjs.resizer;
+ if (resizer) {
+ resizer.parentNode.removeChild(resizer);
+ node._chartjs.resizer = null;
+ }
+
+ delete node._chartjs;
+ }
+
+ return {
+ acquireContext: function(item, config) {
+ if (typeof item === 'string') {
+ item = document.getElementById(item);
+ } else if (item.length) {
+ // Support for array based queries (such as jQuery)
+ item = item[0];
+ }
+
+ if (item && item.canvas) {
+ // Support for any object associated to a canvas (including a context2d)
+ item = item.canvas;
+ }
+
+ if (item instanceof HTMLCanvasElement) {
+ // To prevent canvas fingerprinting, some add-ons undefine the getContext
+ // method, for example: https://github.com/kkapsner/CanvasBlocker
+ // https://github.com/chartjs/Chart.js/issues/2807
+ var context = item.getContext && item.getContext('2d');
+ if (context instanceof CanvasRenderingContext2D) {
+ initCanvas(item, config);
+ return context;
+ }
+ }
+
+ return null;
+ },
+
+ releaseContext: function(context) {
+ var canvas = context.canvas;
+ if (!canvas._chartjs) {
+ return;
+ }
+
+ var initial = canvas._chartjs.initial;
+ ['height', 'width'].forEach(function(prop) {
+ var value = initial[prop];
+ if (value === undefined || value === null) {
+ canvas.removeAttribute(prop);
+ } else {
+ canvas.setAttribute(prop, value);
+ }
+ });
+
+ helpers.each(initial.style || {}, function(value, key) {
+ canvas.style[key] = value;
+ });
+
+ // The canvas render size might have been changed (and thus the state stack discarded),
+ // we can't use save() and restore() to restore the initial state. So make sure that at
+ // least the canvas context is reset to the default state by setting the canvas width.
+ // https://www.w3.org/TR/2011/WD-html5-20110525/the-canvas-element.html
+ canvas.width = canvas.width;
+
+ delete canvas._chartjs;
+ },
+
+ addEventListener: function(chart, type, listener) {
+ var canvas = chart.chart.canvas;
+ if (type === 'resize') {
+ // Note: the resize event is not supported on all browsers.
+ addResizeListener(canvas.parentNode, listener, chart.chart);
+ return;
+ }
+
+ var stub = listener._chartjs || (listener._chartjs = {});
+ var proxies = stub.proxies || (stub.proxies = {});
+ var proxy = proxies[chart.id + '_' + type] = function(event) {
+ listener(fromNativeEvent(event, chart.chart));
+ };
+
+ helpers.addEvent(canvas, type, proxy);
+ },
+
+ removeEventListener: function(chart, type, listener) {
+ var canvas = chart.chart.canvas;
+ if (type === 'resize') {
+ // Note: the resize event is not supported on all browsers.
+ removeResizeListener(canvas.parentNode, listener);
+ return;
+ }
+
+ var stub = listener._chartjs || {};
+ var proxies = stub.proxies || {};
+ var proxy = proxies[chart.id + '_' + type];
+ if (!proxy) {
+ return;
+ }
+
+ helpers.removeEvent(canvas, type, proxy);
+ }
+ };
+};
+
+},{}],42:[function(require,module,exports){
+'use strict';
+
+// By default, select the browser (DOM) platform.
+// @TODO Make possible to select another platform at build time.
+var implementation = require(41);
+
+module.exports = function(Chart) {
+ /**
+ * @namespace Chart.platform
+ * @see https://chartjs.gitbooks.io/proposals/content/Platform.html
+ * @since 2.4.0
+ */
+ Chart.platform = {
+ /**
+ * Called at chart construction time, returns a context2d instance implementing
+ * the [W3C Canvas 2D Context API standard]{@link https://www.w3.org/TR/2dcontext/}.
+ * @param {*} item - The native item from which to acquire context (platform specific)
+ * @param {Object} options - The chart options
+ * @returns {CanvasRenderingContext2D} context2d instance
+ */
+ acquireContext: function() {},
+
+ /**
+ * Called at chart destruction time, releases any resources associated to the context
+ * previously returned by the acquireContext() method.
+ * @param {CanvasRenderingContext2D} context - The context2d instance
+ * @returns {Boolean} true if the method succeeded, else false
+ */
+ releaseContext: function() {},
+
+ /**
+ * Registers the specified listener on the given chart.
+ * @param {Chart} chart - Chart from which to listen for event
+ * @param {String} type - The ({@link IEvent}) type to listen for
+ * @param {Function} listener - Receives a notification (an object that implements
+ * the {@link IEvent} interface) when an event of the specified type occurs.
+ */
+ addEventListener: function() {},
+
+ /**
+ * Removes the specified listener previously registered with addEventListener.
+ * @param {Chart} chart -Chart from which to remove the listener
+ * @param {String} type - The ({@link IEvent}) type to remove
+ * @param {Function} listener - The listener function to remove from the event target.
+ */
+ removeEventListener: function() {}
+ };
+
+ /**
+ * @interface IPlatform
+ * Allows abstracting platform dependencies away from the chart
+ * @borrows Chart.platform.acquireContext as acquireContext
+ * @borrows Chart.platform.releaseContext as releaseContext
+ * @borrows Chart.platform.addEventListener as addEventListener
+ * @borrows Chart.platform.removeEventListener as removeEventListener
+ */
+
+ /**
+ * @interface IEvent
+ * @prop {String} type - The event type name, possible values are:
+ * 'contextmenu', 'mouseenter', 'mousedown', 'mousemove', 'mouseup', 'mouseout',
+ * 'click', 'dblclick', 'keydown', 'keypress', 'keyup' and 'resize'
+ * @prop {*} native - The original native event (null for emulated events, e.g. 'resize')
+ * @prop {Number} x - The mouse x position, relative to the canvas (null for incompatible events)
+ * @prop {Number} y - The mouse y position, relative to the canvas (null for incompatible events)
+ */
+
+ Chart.helpers.extend(Chart.platform, implementation(Chart));
+};
+
+},{"41":41}],43:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
var helpers = Chart.helpers;
// Default config for a category scale
var defaultConfig = {
- position: "bottom"
+ position: 'bottom'
};
var DatasetScale = Chart.Scale.extend({
/**
- * Internal function to get the correct labels. If data.xLabels or data.yLabels are defined, use tose
+ * Internal function to get the correct labels. If data.xLabels or data.yLabels are defined, use those
* else fall back to data.labels
* @private
*/
@@ -9042,8 +10685,15 @@ module.exports = function(Chart) {
me.ticks = (me.minIndex === 0 && me.maxIndex === labels.length - 1) ? labels : labels.slice(me.minIndex, me.maxIndex + 1);
},
- getLabelForIndex: function(index) {
- return this.ticks[index];
+ getLabelForIndex: function(index, datasetIndex) {
+ var me = this;
+ var data = me.chart.data;
+ var isHorizontal = me.isHorizontal();
+
+ if (data.yLabels && !isHorizontal) {
+ return me.getRightValue(data.datasets[datasetIndex].data[index]);
+ }
+ return me.ticks[index - me.minIndex];
},
// Used to get data value locations. Value can either be an index or a numerical value
@@ -9059,26 +10709,23 @@ module.exports = function(Chart) {
}
if (me.isHorizontal()) {
- var innerWidth = me.width - (me.paddingLeft + me.paddingRight);
- var valueWidth = innerWidth / offsetAmt;
- var widthOffset = (valueWidth * (index - me.minIndex)) + me.paddingLeft;
+ var valueWidth = me.width / offsetAmt;
+ var widthOffset = (valueWidth * (index - me.minIndex));
- if (me.options.gridLines.offsetGridLines && includeOffset || me.maxIndex === me.minIndex && includeOffset) {
+ if (me.options.gridLines.offsetGridLines && includeOffset || me.maxIndex === me.minIndex && includeOffset) {
widthOffset += (valueWidth / 2);
- }
+ }
return me.left + Math.round(widthOffset);
- } else {
- var innerHeight = me.height - (me.paddingTop + me.paddingBottom);
- var valueHeight = innerHeight / offsetAmt;
- var heightOffset = (valueHeight * (index - me.minIndex)) + me.paddingTop;
-
- if (me.options.gridLines.offsetGridLines && includeOffset) {
- heightOffset += (valueHeight / 2);
- }
+ }
+ var valueHeight = me.height / offsetAmt;
+ var heightOffset = (valueHeight * (index - me.minIndex));
- return me.top + Math.round(heightOffset);
+ if (me.options.gridLines.offsetGridLines && includeOffset) {
+ heightOffset += (valueHeight / 2);
}
+
+ return me.top + Math.round(heightOffset);
},
getPixelForTick: function(index, includeOffset) {
return this.getPixelForValue(this.ticks[index], index + this.minIndex, null, includeOffset);
@@ -9088,15 +10735,13 @@ module.exports = function(Chart) {
var value;
var offsetAmt = Math.max((me.ticks.length - ((me.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
var horz = me.isHorizontal();
- var innerDimension = horz ? me.width - (me.paddingLeft + me.paddingRight) : me.height - (me.paddingTop + me.paddingBottom);
- var valueDimension = innerDimension / offsetAmt;
+ var valueDimension = (horz ? me.width : me.height) / offsetAmt;
pixel -= horz ? me.left : me.top;
if (me.options.gridLines.offsetGridLines) {
pixel -= (valueDimension / 2);
}
- pixel -= horz ? me.paddingLeft : me.paddingTop;
if (pixel <= 0) {
value = 0;
@@ -9111,44 +10756,21 @@ module.exports = function(Chart) {
}
});
- Chart.scaleService.registerScaleType("category", DatasetScale, defaultConfig);
+ Chart.scaleService.registerScaleType('category', DatasetScale, defaultConfig);
};
-},{}],40:[function(require,module,exports){
-"use strict";
+
+},{}],44:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
var helpers = Chart.helpers;
var defaultConfig = {
- position: "left",
+ position: 'left',
ticks: {
- callback: function(tickValue, index, ticks) {
- // If we have lots of ticks, don't use the ones
- var delta = ticks.length > 3 ? ticks[2] - ticks[1] : ticks[1] - ticks[0];
-
- // If we have a number like 2.5 as the delta, figure out how many decimal places we need
- if (Math.abs(delta) > 1) {
- if (tickValue !== Math.floor(tickValue)) {
- // not an integer
- delta = tickValue - Math.floor(tickValue);
- }
- }
-
- var logDelta = helpers.log10(Math.abs(delta));
- var tickString = '';
-
- if (tickValue !== 0) {
- var numDecimal = -1 * Math.floor(logDelta);
- numDecimal = Math.max(Math.min(numDecimal, 20), 0); // toFixed has a max of 20 decimal places
- tickString = tickValue.toFixed(numDecimal);
- } else {
- tickString = '0'; // never show decimal places for 0
- }
-
- return tickString;
- }
+ callback: Chart.Ticks.formatters.linear
}
};
@@ -9169,23 +10791,43 @@ module.exports = function(Chart) {
me.min = null;
me.max = null;
- if (opts.stacked) {
- var valuesPerType = {};
- var hasPositiveValues = false;
- var hasNegativeValues = false;
+ var hasStacks = opts.stacked;
+ if (hasStacks === undefined) {
+ helpers.each(datasets, function(dataset, datasetIndex) {
+ if (hasStacks) {
+ return;
+ }
+
+ var meta = chart.getDatasetMeta(datasetIndex);
+ if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) &&
+ meta.stack !== undefined) {
+ hasStacks = true;
+ }
+ });
+ }
+
+ if (opts.stacked || hasStacks) {
+ var valuesPerStack = {};
helpers.each(datasets, function(dataset, datasetIndex) {
var meta = chart.getDatasetMeta(datasetIndex);
- if (valuesPerType[meta.type] === undefined) {
- valuesPerType[meta.type] = {
+ var key = [
+ meta.type,
+ // we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
+ ((opts.stacked === undefined && meta.stack === undefined) ? datasetIndex : ''),
+ meta.stack
+ ].join('.');
+
+ if (valuesPerStack[key] === undefined) {
+ valuesPerStack[key] = {
positiveValues: [],
negativeValues: []
};
}
// Store these per type
- var positiveValues = valuesPerType[meta.type].positiveValues;
- var negativeValues = valuesPerType[meta.type].negativeValues;
+ var positiveValues = valuesPerStack[key].positiveValues;
+ var negativeValues = valuesPerStack[key].negativeValues;
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
helpers.each(dataset.data, function(rawValue, index) {
@@ -9199,20 +10841,16 @@ module.exports = function(Chart) {
if (opts.relativePoints) {
positiveValues[index] = 100;
+ } else if (value < 0) {
+ negativeValues[index] += value;
} else {
- if (value < 0) {
- hasNegativeValues = true;
- negativeValues[index] += value;
- } else {
- hasPositiveValues = true;
- positiveValues[index] += value;
- }
+ positiveValues[index] += value;
}
});
}
});
- helpers.each(valuesPerType, function(valuesForType) {
+ helpers.each(valuesPerStack, function(valuesForType) {
var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
var minVal = helpers.min(values);
var maxVal = helpers.max(values);
@@ -9279,43 +10917,37 @@ module.exports = function(Chart) {
// This must be called after fit has been run so that
// this.left, this.top, this.right, and this.bottom have been defined
var me = this;
- var paddingLeft = me.paddingLeft;
- var paddingBottom = me.paddingBottom;
var start = me.start;
var rightValue = +me.getRightValue(value);
var pixel;
- var innerDimension;
var range = me.end - start;
if (me.isHorizontal()) {
- innerDimension = me.width - (paddingLeft + me.paddingRight);
- pixel = me.left + (innerDimension / range * (rightValue - start));
- return Math.round(pixel + paddingLeft);
- } else {
- innerDimension = me.height - (me.paddingTop + paddingBottom);
- pixel = (me.bottom - paddingBottom) - (innerDimension / range * (rightValue - start));
+ pixel = me.left + (me.width / range * (rightValue - start));
return Math.round(pixel);
}
+
+ pixel = me.bottom - (me.height / range * (rightValue - start));
+ return Math.round(pixel);
},
getValueForPixel: function(pixel) {
var me = this;
var isHorizontal = me.isHorizontal();
- var paddingLeft = me.paddingLeft;
- var paddingBottom = me.paddingBottom;
- var innerDimension = isHorizontal ? me.width - (paddingLeft + me.paddingRight) : me.height - (me.paddingTop + paddingBottom);
- var offset = (isHorizontal ? pixel - me.left - paddingLeft : me.bottom - paddingBottom - pixel) / innerDimension;
+ var innerDimension = isHorizontal ? me.width : me.height;
+ var offset = (isHorizontal ? pixel - me.left : me.bottom - pixel) / innerDimension;
return me.start + ((me.end - me.start) * offset);
},
getPixelForTick: function(index) {
return this.getPixelForValue(this.ticksAsNumbers[index]);
}
});
- Chart.scaleService.registerScaleType("linear", LinearScale, defaultConfig);
+ Chart.scaleService.registerScaleType('linear', LinearScale, defaultConfig);
};
-},{}],41:[function(require,module,exports){
-"use strict";
+
+},{}],45:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -9339,7 +10971,7 @@ module.exports = function(Chart) {
// move the top up to 0
me.max = 0;
} else if (minSign > 0 && maxSign > 0) {
- // move the botttom down to 0
+ // move the bottom down to 0
me.min = 0;
}
}
@@ -9370,49 +11002,22 @@ module.exports = function(Chart) {
buildTicks: function() {
var me = this;
var opts = me.options;
- var ticks = me.ticks = [];
var tickOpts = opts.ticks;
- var getValueOrDefault = helpers.getValueOrDefault;
// Figure out what the max number of ticks we can support it is based on the size of
// the axis area. For now, we say that the minimum tick spacing in pixels must be 50
// We also limit the maximum number of ticks to 11 which gives a nice 10 squares on
- // the graph
-
+ // the graph. Make sure we always have at least 2 ticks
var maxTicks = me.getTickLimit();
-
- // Make sure we always have at least 2 ticks
maxTicks = Math.max(2, maxTicks);
- // To get a "nice" value for the tick spacing, we will use the appropriately named
- // "nice number" algorithm. See http://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
- // for details.
-
- var spacing;
- var fixedStepSizeSet = (tickOpts.fixedStepSize && tickOpts.fixedStepSize > 0) || (tickOpts.stepSize && tickOpts.stepSize > 0);
- if (fixedStepSizeSet) {
- spacing = getValueOrDefault(tickOpts.fixedStepSize, tickOpts.stepSize);
- } else {
- var niceRange = helpers.niceNum(me.max - me.min, false);
- spacing = helpers.niceNum(niceRange / (maxTicks - 1), true);
- }
- var niceMin = Math.floor(me.min / spacing) * spacing;
- var niceMax = Math.ceil(me.max / spacing) * spacing;
- var numSpaces = (niceMax - niceMin) / spacing;
-
- // If very close to our rounded value, use it.
- if (helpers.almostEquals(numSpaces, Math.round(numSpaces), spacing / 1000)) {
- numSpaces = Math.round(numSpaces);
- } else {
- numSpaces = Math.ceil(numSpaces);
- }
-
- // Put the values into the ticks array
- ticks.push(tickOpts.min !== undefined ? tickOpts.min : niceMin);
- for (var j = 1; j < numSpaces; ++j) {
- ticks.push(niceMin + (j * spacing));
- }
- ticks.push(tickOpts.max !== undefined ? tickOpts.max : niceMax);
+ var numericGeneratorOptions = {
+ maxTicks: maxTicks,
+ min: tickOpts.min,
+ max: tickOpts.max,
+ stepSize: helpers.getValueOrDefault(tickOpts.fixedStepSize, tickOpts.stepSize)
+ };
+ var ticks = me.ticks = Chart.Ticks.generators.linear(numericGeneratorOptions, me);
me.handleDirectionalChanges();
@@ -9440,29 +11045,20 @@ module.exports = function(Chart) {
}
});
};
-},{}],42:[function(require,module,exports){
-"use strict";
+
+},{}],46:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
var helpers = Chart.helpers;
var defaultConfig = {
- position: "left",
+ position: 'left',
// label settings
ticks: {
- callback: function(value, index, arr) {
- var remain = value / (Math.pow(10, Math.floor(helpers.log10(value))));
-
- if (value === 0){
- return '0';
- } else if (remain === 1 || remain === 2 || remain === 5 || index === 0 || index === arr.length - 1) {
- return value.toExponential();
- } else {
- return '';
- }
- }
+ callback: Chart.Ticks.formatters.logarithmic
}
};
@@ -9485,18 +11081,40 @@ module.exports = function(Chart) {
me.max = null;
me.minNotZero = null;
- if (opts.stacked) {
- var valuesPerType = {};
+ var hasStacks = opts.stacked;
+ if (hasStacks === undefined) {
+ helpers.each(datasets, function(dataset, datasetIndex) {
+ if (hasStacks) {
+ return;
+ }
+
+ var meta = chart.getDatasetMeta(datasetIndex);
+ if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) &&
+ meta.stack !== undefined) {
+ hasStacks = true;
+ }
+ });
+ }
+
+ if (opts.stacked || hasStacks) {
+ var valuesPerStack = {};
helpers.each(datasets, function(dataset, datasetIndex) {
var meta = chart.getDatasetMeta(datasetIndex);
+ var key = [
+ meta.type,
+ // we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
+ ((opts.stacked === undefined && meta.stack === undefined) ? datasetIndex : ''),
+ meta.stack
+ ].join('.');
+
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
- if (valuesPerType[meta.type] === undefined) {
- valuesPerType[meta.type] = [];
+ if (valuesPerStack[key] === undefined) {
+ valuesPerStack[key] = [];
}
helpers.each(dataset.data, function(rawValue, index) {
- var values = valuesPerType[meta.type];
+ var values = valuesPerStack[key];
var value = +me.getRightValue(rawValue);
if (isNaN(value) || meta.data[index].hidden) {
return;
@@ -9514,7 +11132,7 @@ module.exports = function(Chart) {
}
});
- helpers.each(valuesPerType, function(valuesForType) {
+ helpers.each(valuesPerStack, function(valuesForType) {
var minVal = helpers.min(valuesForType);
var maxVal = helpers.max(valuesForType);
me.min = me.min === null ? minVal : Math.min(me.min, minVal);
@@ -9543,7 +11161,7 @@ module.exports = function(Chart) {
me.max = value;
}
- if(value !== 0 && (me.minNotZero === null || value < me.minNotZero)) {
+ if (value !== 0 && (me.minNotZero === null || value < me.minNotZero)) {
me.minNotZero = value;
}
});
@@ -9568,43 +11186,12 @@ module.exports = function(Chart) {
var me = this;
var opts = me.options;
var tickOpts = opts.ticks;
- var getValueOrDefault = helpers.getValueOrDefault;
-
- // Reset the ticks array. Later on, we will draw a grid line at these positions
- // The array simply contains the numerical value of the spots where ticks will be
- var ticks = me.ticks = [];
-
- // Figure out what the max number of ticks we can support it is based on the size of
- // the axis area. For now, we say that the minimum tick spacing in pixels must be 50
- // We also limit the maximum number of ticks to 11 which gives a nice 10 squares on
- // the graph
-
- var tickVal = getValueOrDefault(tickOpts.min, Math.pow(10, Math.floor(helpers.log10(me.min))));
-
- while (tickVal < me.max) {
- ticks.push(tickVal);
-
- var exp;
- var significand;
- if(tickVal === 0){
- exp = Math.floor(helpers.log10(me.minNotZero));
- significand = Math.round(me.minNotZero / Math.pow(10, exp));
- } else {
- exp = Math.floor(helpers.log10(tickVal));
- significand = Math.floor(tickVal / Math.pow(10, exp)) + 1;
- }
-
- if (significand === 10) {
- significand = 1;
- ++exp;
- }
-
- tickVal = significand * Math.pow(10, exp);
- }
-
- var lastTick = getValueOrDefault(tickOpts.max, tickVal);
- ticks.push(lastTick);
+ var generationOptions = {
+ min: tickOpts.min,
+ max: tickOpts.max
+ };
+ var ticks = me.ticks = Chart.Ticks.generators.logarithmic(generationOptions, me);
if (!me.isHorizontal()) {
// We are in a vertical orientation. The top value is the highest. So reverse the array
@@ -9646,47 +11233,43 @@ module.exports = function(Chart) {
var start = me.start;
var newVal = +me.getRightValue(value);
var range;
- var paddingTop = me.paddingTop;
- var paddingBottom = me.paddingBottom;
- var paddingLeft = me.paddingLeft;
var opts = me.options;
var tickOpts = opts.ticks;
if (me.isHorizontal()) {
range = helpers.log10(me.end) - helpers.log10(start); // todo: if start === 0
if (newVal === 0) {
- pixel = me.left + paddingLeft;
+ pixel = me.left;
} else {
- innerDimension = me.width - (paddingLeft + me.paddingRight);
+ innerDimension = me.width;
pixel = me.left + (innerDimension / range * (helpers.log10(newVal) - helpers.log10(start)));
- pixel += paddingLeft;
}
} else {
- // Bottom - top since pixels increase downard on a screen
- innerDimension = me.height - (paddingTop + paddingBottom);
- if(start === 0 && !tickOpts.reverse){
+ // Bottom - top since pixels increase downward on a screen
+ innerDimension = me.height;
+ if (start === 0 && !tickOpts.reverse) {
range = helpers.log10(me.end) - helpers.log10(me.minNotZero);
if (newVal === start) {
- pixel = me.bottom - paddingBottom;
- } else if(newVal === me.minNotZero){
- pixel = me.bottom - paddingBottom - innerDimension * 0.02;
+ pixel = me.bottom;
+ } else if (newVal === me.minNotZero) {
+ pixel = me.bottom - innerDimension * 0.02;
} else {
- pixel = me.bottom - paddingBottom - innerDimension * 0.02 - (innerDimension * 0.98/ range * (helpers.log10(newVal)-helpers.log10(me.minNotZero)));
+ pixel = me.bottom - innerDimension * 0.02 - (innerDimension * 0.98/ range * (helpers.log10(newVal)-helpers.log10(me.minNotZero)));
}
- } else if (me.end === 0 && tickOpts.reverse){
+ } else if (me.end === 0 && tickOpts.reverse) {
range = helpers.log10(me.start) - helpers.log10(me.minNotZero);
if (newVal === me.end) {
- pixel = me.top + paddingTop;
- } else if(newVal === me.minNotZero){
- pixel = me.top + paddingTop + innerDimension * 0.02;
+ pixel = me.top;
+ } else if (newVal === me.minNotZero) {
+ pixel = me.top + innerDimension * 0.02;
} else {
- pixel = me.top + paddingTop + innerDimension * 0.02 + (innerDimension * 0.98/ range * (helpers.log10(newVal)-helpers.log10(me.minNotZero)));
+ pixel = me.top + innerDimension * 0.02 + (innerDimension * 0.98/ range * (helpers.log10(newVal)-helpers.log10(me.minNotZero)));
}
} else {
range = helpers.log10(me.end) - helpers.log10(start);
- innerDimension = me.height - (paddingTop + paddingBottom);
- pixel = (me.bottom - paddingBottom) - (innerDimension / range * (helpers.log10(newVal) - helpers.log10(start)));
- }
+ innerDimension = me.height;
+ pixel = me.bottom - (innerDimension / range * (helpers.log10(newVal) - helpers.log10(start)));
+ }
}
return pixel;
},
@@ -9696,20 +11279,21 @@ module.exports = function(Chart) {
var value, innerDimension;
if (me.isHorizontal()) {
- innerDimension = me.width - (me.paddingLeft + me.paddingRight);
- value = me.start * Math.pow(10, (pixel - me.left - me.paddingLeft) * range / innerDimension);
+ innerDimension = me.width;
+ value = me.start * Math.pow(10, (pixel - me.left) * range / innerDimension);
} else { // todo: if start === 0
- innerDimension = me.height - (me.paddingTop + me.paddingBottom);
- value = Math.pow(10, (me.bottom - me.paddingBottom - pixel) * range / innerDimension) / me.start;
+ innerDimension = me.height;
+ value = Math.pow(10, (me.bottom - pixel) * range / innerDimension) / me.start;
}
return value;
}
});
- Chart.scaleService.registerScaleType("logarithmic", LogarithmicScale, defaultConfig);
+ Chart.scaleService.registerScaleType('logarithmic', LogarithmicScale, defaultConfig);
};
-},{}],43:[function(require,module,exports){
-"use strict";
+
+},{}],47:[function(require,module,exports){
+'use strict';
module.exports = function(Chart) {
@@ -9719,47 +11303,305 @@ module.exports = function(Chart) {
var defaultConfig = {
display: true,
- //Boolean - Whether to animate scaling the chart from the centre
+ // Boolean - Whether to animate scaling the chart from the centre
animate: true,
lineArc: false,
- position: "chartArea",
+ position: 'chartArea',
angleLines: {
display: true,
- color: "rgba(0, 0, 0, 0.1)",
+ color: 'rgba(0, 0, 0, 0.1)',
lineWidth: 1
},
// label settings
ticks: {
- //Boolean - Show a backdrop to the scale label
+ // Boolean - Show a backdrop to the scale label
showLabelBackdrop: true,
- //String - The colour of the label backdrop
- backdropColor: "rgba(255,255,255,0.75)",
+ // String - The colour of the label backdrop
+ backdropColor: 'rgba(255,255,255,0.75)',
- //Number - The backdrop padding above & below the label in pixels
+ // Number - The backdrop padding above & below the label in pixels
backdropPaddingY: 2,
- //Number - The backdrop padding to the side of the label in pixels
- backdropPaddingX: 2
+ // Number - The backdrop padding to the side of the label in pixels
+ backdropPaddingX: 2,
+
+ callback: Chart.Ticks.formatters.linear
},
pointLabels: {
- //Number - Point label font size in pixels
+ // Number - Point label font size in pixels
fontSize: 10,
- //Function - Used to convert point labels
+ // Function - Used to convert point labels
callback: function(label) {
return label;
}
}
};
+ function getValueCount(scale) {
+ return !scale.options.lineArc ? scale.chart.data.labels.length : 0;
+ }
+
+ function getPointLabelFontOptions(scale) {
+ var pointLabelOptions = scale.options.pointLabels;
+ var fontSize = helpers.getValueOrDefault(pointLabelOptions.fontSize, globalDefaults.defaultFontSize);
+ var fontStyle = helpers.getValueOrDefault(pointLabelOptions.fontStyle, globalDefaults.defaultFontStyle);
+ var fontFamily = helpers.getValueOrDefault(pointLabelOptions.fontFamily, globalDefaults.defaultFontFamily);
+ var font = helpers.fontString(fontSize, fontStyle, fontFamily);
+
+ return {
+ size: fontSize,
+ style: fontStyle,
+ family: fontFamily,
+ font: font
+ };
+ }
+
+ function measureLabelSize(ctx, fontSize, label) {
+ if (helpers.isArray(label)) {
+ return {
+ w: helpers.longestText(ctx, ctx.font, label),
+ h: (label.length * fontSize) + ((label.length - 1) * 1.5 * fontSize)
+ };
+ }
+
+ return {
+ w: ctx.measureText(label).width,
+ h: fontSize
+ };
+ }
+
+ function determineLimits(angle, pos, size, min, max) {
+ if (angle === min || angle === max) {
+ return {
+ start: pos - (size / 2),
+ end: pos + (size / 2)
+ };
+ } else if (angle < min || angle > max) {
+ return {
+ start: pos - size - 5,
+ end: pos
+ };
+ }
+
+ return {
+ start: pos,
+ end: pos + size + 5
+ };
+ }
+
+ /**
+ * Helper function to fit a radial linear scale with point labels
+ */
+ function fitWithPointLabels(scale) {
+ /*
+ * Right, this is really confusing and there is a lot of maths going on here
+ * The gist of the problem is here: https://gist.github.com/nnnick/696cc9c55f4b0beb8fe9
+ *
+ * Reaction: https://dl.dropboxusercontent.com/u/34601363/toomuchscience.gif
+ *
+ * Solution:
+ *
+ * We assume the radius of the polygon is half the size of the canvas at first
+ * at each index we check if the text overlaps.
+ *
+ * Where it does, we store that angle and that index.
+ *
+ * After finding the largest index and angle we calculate how much we need to remove
+ * from the shape radius to move the point inwards by that x.
+ *
+ * We average the left and right distances to get the maximum shape radius that can fit in the box
+ * along with labels.
+ *
+ * Once we have that, we can find the centre point for the chart, by taking the x text protrusion
+ * on each side, removing that from the size, halving it and adding the left x protrusion width.
+ *
+ * This will mean we have a shape fitted to the canvas, as large as it can be with the labels
+ * and position it in the most space efficient manner
+ *
+ * https://dl.dropboxusercontent.com/u/34601363/yeahscience.gif
+ */
+
+ var plFont = getPointLabelFontOptions(scale);
+
+ // Get maximum radius of the polygon. Either half the height (minus the text width) or half the width.
+ // Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points
+ var largestPossibleRadius = Math.min(scale.height / 2, scale.width / 2);
+ var furthestLimits = {
+ l: scale.width,
+ r: 0,
+ t: scale.height,
+ b: 0
+ };
+ var furthestAngles = {};
+ var i;
+ var textSize;
+ var pointPosition;
+
+ scale.ctx.font = plFont.font;
+ scale._pointLabelSizes = [];
+
+ var valueCount = getValueCount(scale);
+ for (i = 0; i < valueCount; i++) {
+ pointPosition = scale.getPointPosition(i, largestPossibleRadius);
+ textSize = measureLabelSize(scale.ctx, plFont.size, scale.pointLabels[i] || '');
+ scale._pointLabelSizes[i] = textSize;
+
+ // Add quarter circle to make degree 0 mean top of circle
+ var angleRadians = scale.getIndexAngle(i);
+ var angle = helpers.toDegrees(angleRadians) % 360;
+ var hLimits = determineLimits(angle, pointPosition.x, textSize.w, 0, 180);
+ var vLimits = determineLimits(angle, pointPosition.y, textSize.h, 90, 270);
+
+ if (hLimits.start < furthestLimits.l) {
+ furthestLimits.l = hLimits.start;
+ furthestAngles.l = angleRadians;
+ }
+
+ if (hLimits.end > furthestLimits.r) {
+ furthestLimits.r = hLimits.end;
+ furthestAngles.r = angleRadians;
+ }
+
+ if (vLimits.start < furthestLimits.t) {
+ furthestLimits.t = vLimits.start;
+ furthestAngles.t = angleRadians;
+ }
+
+ if (vLimits.end > furthestLimits.b) {
+ furthestLimits.b = vLimits.end;
+ furthestAngles.b = angleRadians;
+ }
+ }
+
+ scale.setReductions(largestPossibleRadius, furthestLimits, furthestAngles);
+ }
+
+ /**
+ * Helper function to fit a radial linear scale with no point labels
+ */
+ function fit(scale) {
+ var largestPossibleRadius = Math.min(scale.height / 2, scale.width / 2);
+ scale.drawingArea = Math.round(largestPossibleRadius);
+ scale.setCenterPoint(0, 0, 0, 0);
+ }
+
+ function getTextAlignForAngle(angle) {
+ if (angle === 0 || angle === 180) {
+ return 'center';
+ } else if (angle < 180) {
+ return 'left';
+ }
+
+ return 'right';
+ }
+
+ function fillText(ctx, text, position, fontSize) {
+ if (helpers.isArray(text)) {
+ var y = position.y;
+ var spacing = 1.5 * fontSize;
+
+ for (var i = 0; i < text.length; ++i) {
+ ctx.fillText(text[i], position.x, y);
+ y+= spacing;
+ }
+ } else {
+ ctx.fillText(text, position.x, position.y);
+ }
+ }
+
+ function adjustPointPositionForLabelHeight(angle, textSize, position) {
+ if (angle === 90 || angle === 270) {
+ position.y -= (textSize.h / 2);
+ } else if (angle > 270 || angle < 90) {
+ position.y -= textSize.h;
+ }
+ }
+
+ function drawPointLabels(scale) {
+ var ctx = scale.ctx;
+ var getValueOrDefault = helpers.getValueOrDefault;
+ var opts = scale.options;
+ var angleLineOpts = opts.angleLines;
+ var pointLabelOpts = opts.pointLabels;
+
+ ctx.lineWidth = angleLineOpts.lineWidth;
+ ctx.strokeStyle = angleLineOpts.color;
+
+ var outerDistance = scale.getDistanceFromCenterForValue(opts.reverse ? scale.min : scale.max);
+
+ // Point Label Font
+ var plFont = getPointLabelFontOptions(scale);
+
+ ctx.textBaseline = 'top';
+
+ for (var i = getValueCount(scale) - 1; i >= 0; i--) {
+ if (angleLineOpts.display) {
+ var outerPosition = scale.getPointPosition(i, outerDistance);
+ ctx.beginPath();
+ ctx.moveTo(scale.xCenter, scale.yCenter);
+ ctx.lineTo(outerPosition.x, outerPosition.y);
+ ctx.stroke();
+ ctx.closePath();
+ }
+ // Extra 3px out for some label spacing
+ var pointLabelPosition = scale.getPointPosition(i, outerDistance + 5);
+
+ // Keep this in loop since we may support array properties here
+ var pointLabelFontColor = getValueOrDefault(pointLabelOpts.fontColor, globalDefaults.defaultFontColor);
+ ctx.font = plFont.font;
+ ctx.fillStyle = pointLabelFontColor;
+
+ var angleRadians = scale.getIndexAngle(i);
+ var angle = helpers.toDegrees(angleRadians);
+ ctx.textAlign = getTextAlignForAngle(angle);
+ adjustPointPositionForLabelHeight(angle, scale._pointLabelSizes[i], pointLabelPosition);
+ fillText(ctx, scale.pointLabels[i] || '', pointLabelPosition, plFont.size);
+ }
+ }
+
+ function drawRadiusLine(scale, gridLineOpts, radius, index) {
+ var ctx = scale.ctx;
+ ctx.strokeStyle = helpers.getValueAtIndexOrDefault(gridLineOpts.color, index - 1);
+ ctx.lineWidth = helpers.getValueAtIndexOrDefault(gridLineOpts.lineWidth, index - 1);
+
+ if (scale.options.lineArc) {
+ // Draw circular arcs between the points
+ ctx.beginPath();
+ ctx.arc(scale.xCenter, scale.yCenter, radius, 0, Math.PI * 2);
+ ctx.closePath();
+ ctx.stroke();
+ } else {
+ // Draw straight lines connecting each index
+ var valueCount = getValueCount(scale);
+
+ if (valueCount === 0) {
+ return;
+ }
+
+ ctx.beginPath();
+ var pointPosition = scale.getPointPosition(0, radius);
+ ctx.moveTo(pointPosition.x, pointPosition.y);
+
+ for (var i = 1; i < valueCount; i++) {
+ pointPosition = scale.getPointPosition(i, radius);
+ ctx.lineTo(pointPosition.x, pointPosition.y);
+ }
+
+ ctx.closePath();
+ ctx.stroke();
+ }
+ }
+
+ function numberOrZero(param) {
+ return helpers.isNumber(param) ? param : 0;
+ }
+
var LinearRadialScale = Chart.LinearScaleBase.extend({
- getValueCount: function() {
- return this.chart.data.labels.length;
- },
setDimensions: function() {
var me = this;
var opts = me.options;
@@ -9777,9 +11619,8 @@ module.exports = function(Chart) {
determineDataLimits: function() {
var me = this;
var chart = me.chart;
- me.min = null;
- me.max = null;
-
+ var min = Number.POSITIVE_INFINITY;
+ var max = Number.NEGATIVE_INFINITY;
helpers.each(chart.data.datasets, function(dataset, datasetIndex) {
if (chart.isDatasetVisible(datasetIndex)) {
@@ -9791,21 +11632,15 @@ module.exports = function(Chart) {
return;
}
- if (me.min === null) {
- me.min = value;
- } else if (value < me.min) {
- me.min = value;
- }
-
- if (me.max === null) {
- me.max = value;
- } else if (value > me.max) {
- me.max = value;
- }
+ min = Math.min(value, min);
+ max = Math.max(value, max);
});
}
});
+ me.min = (min === Number.POSITIVE_INFINITY ? 0 : min);
+ me.max = (max === Number.NEGATIVE_INFINITY ? 0 : max);
+
// Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero
me.handleTickRangeOptions();
},
@@ -9825,124 +11660,46 @@ module.exports = function(Chart) {
return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
},
fit: function() {
- /*
- * Right, this is really confusing and there is a lot of maths going on here
- * The gist of the problem is here: https://gist.github.com/nnnick/696cc9c55f4b0beb8fe9
- *
- * Reaction: https://dl.dropboxusercontent.com/u/34601363/toomuchscience.gif
- *
- * Solution:
- *
- * We assume the radius of the polygon is half the size of the canvas at first
- * at each index we check if the text overlaps.
- *
- * Where it does, we store that angle and that index.
- *
- * After finding the largest index and angle we calculate how much we need to remove
- * from the shape radius to move the point inwards by that x.
- *
- * We average the left and right distances to get the maximum shape radius that can fit in the box
- * along with labels.
- *
- * Once we have that, we can find the centre point for the chart, by taking the x text protrusion
- * on each side, removing that from the size, halving it and adding the left x protrusion width.
- *
- * This will mean we have a shape fitted to the canvas, as large as it can be with the labels
- * and position it in the most space efficient manner
- *
- * https://dl.dropboxusercontent.com/u/34601363/yeahscience.gif
- */
-
- var pointLabels = this.options.pointLabels;
- var pointLabelFontSize = helpers.getValueOrDefault(pointLabels.fontSize, globalDefaults.defaultFontSize);
- var pointLabeFontStyle = helpers.getValueOrDefault(pointLabels.fontStyle, globalDefaults.defaultFontStyle);
- var pointLabeFontFamily = helpers.getValueOrDefault(pointLabels.fontFamily, globalDefaults.defaultFontFamily);
- var pointLabeFont = helpers.fontString(pointLabelFontSize, pointLabeFontStyle, pointLabeFontFamily);
-
- // Get maximum radius of the polygon. Either half the height (minus the text width) or half the width.
- // Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points
- var largestPossibleRadius = helpers.min([(this.height / 2 - pointLabelFontSize - 5), this.width / 2]),
- pointPosition,
- i,
- textWidth,
- halfTextWidth,
- furthestRight = this.width,
- furthestRightIndex,
- furthestRightAngle,
- furthestLeft = 0,
- furthestLeftIndex,
- furthestLeftAngle,
- xProtrusionLeft,
- xProtrusionRight,
- radiusReductionRight,
- radiusReductionLeft;
- this.ctx.font = pointLabeFont;
-
- for (i = 0; i < this.getValueCount(); i++) {
- // 5px to space the text slightly out - similar to what we do in the draw function.
- pointPosition = this.getPointPosition(i, largestPossibleRadius);
- textWidth = this.ctx.measureText(this.pointLabels[i] ? this.pointLabels[i] : '').width + 5;
-
- // Add quarter circle to make degree 0 mean top of circle
- var angleRadians = this.getIndexAngle(i) + (Math.PI / 2);
- var angle = (angleRadians * 360 / (2 * Math.PI)) % 360;
-
- if (angle === 0 || angle === 180) {
- // At angle 0 and 180, we're at exactly the top/bottom
- // of the radar chart, so text will be aligned centrally, so we'll half it and compare
- // w/left and right text sizes
- halfTextWidth = textWidth / 2;
- if (pointPosition.x + halfTextWidth > furthestRight) {
- furthestRight = pointPosition.x + halfTextWidth;
- furthestRightIndex = i;
- }
- if (pointPosition.x - halfTextWidth < furthestLeft) {
- furthestLeft = pointPosition.x - halfTextWidth;
- furthestLeftIndex = i;
- }
- } else if (angle < 180) {
- // Less than half the values means we'll left align the text
- if (pointPosition.x + textWidth > furthestRight) {
- furthestRight = pointPosition.x + textWidth;
- furthestRightIndex = i;
- }
- } else {
- // More than half the values means we'll right align the text
- if (pointPosition.x - textWidth < furthestLeft) {
- furthestLeft = pointPosition.x - textWidth;
- furthestLeftIndex = i;
- }
- }
+ if (this.options.lineArc) {
+ fit(this);
+ } else {
+ fitWithPointLabels(this);
}
-
- xProtrusionLeft = furthestLeft;
- xProtrusionRight = Math.ceil(furthestRight - this.width);
-
- furthestRightAngle = this.getIndexAngle(furthestRightIndex);
- furthestLeftAngle = this.getIndexAngle(furthestLeftIndex);
-
- radiusReductionRight = xProtrusionRight / Math.sin(furthestRightAngle + Math.PI / 2);
- radiusReductionLeft = xProtrusionLeft / Math.sin(furthestLeftAngle + Math.PI / 2);
-
- // Ensure we actually need to reduce the size of the chart
- radiusReductionRight = (helpers.isNumber(radiusReductionRight)) ? radiusReductionRight : 0;
- radiusReductionLeft = (helpers.isNumber(radiusReductionLeft)) ? radiusReductionLeft : 0;
-
- this.drawingArea = Math.round(largestPossibleRadius - (radiusReductionLeft + radiusReductionRight) / 2);
- this.setCenterPoint(radiusReductionLeft, radiusReductionRight);
},
- setCenterPoint: function(leftMovement, rightMovement) {
+ /**
+ * Set radius reductions and determine new radius and center point
+ * @private
+ */
+ setReductions: function(largestPossibleRadius, furthestLimits, furthestAngles) {
+ var me = this;
+ var radiusReductionLeft = furthestLimits.l / Math.sin(furthestAngles.l);
+ var radiusReductionRight = Math.max(furthestLimits.r - me.width, 0) / Math.sin(furthestAngles.r);
+ var radiusReductionTop = -furthestLimits.t / Math.cos(furthestAngles.t);
+ var radiusReductionBottom = -Math.max(furthestLimits.b - me.height, 0) / Math.cos(furthestAngles.b);
+
+ radiusReductionLeft = numberOrZero(radiusReductionLeft);
+ radiusReductionRight = numberOrZero(radiusReductionRight);
+ radiusReductionTop = numberOrZero(radiusReductionTop);
+ radiusReductionBottom = numberOrZero(radiusReductionBottom);
+
+ me.drawingArea = Math.min(
+ Math.round(largestPossibleRadius - (radiusReductionLeft + radiusReductionRight) / 2),
+ Math.round(largestPossibleRadius - (radiusReductionTop + radiusReductionBottom) / 2));
+ me.setCenterPoint(radiusReductionLeft, radiusReductionRight, radiusReductionTop, radiusReductionBottom);
+ },
+ setCenterPoint: function(leftMovement, rightMovement, topMovement, bottomMovement) {
var me = this;
var maxRight = me.width - rightMovement - me.drawingArea,
- maxLeft = leftMovement + me.drawingArea;
+ maxLeft = leftMovement + me.drawingArea,
+ maxTop = topMovement + me.drawingArea,
+ maxBottom = me.height - bottomMovement - me.drawingArea;
me.xCenter = Math.round(((maxLeft + maxRight) / 2) + me.left);
- // Always vertically in the centre as the text height doesn't change
- me.yCenter = Math.round((me.height / 2) + me.top);
+ me.yCenter = Math.round(((maxTop + maxBottom) / 2) + me.top);
},
getIndexAngle: function(index) {
- var angleMultiplier = (Math.PI * 2) / this.getValueCount();
+ var angleMultiplier = (Math.PI * 2) / getValueCount(this);
var startAngle = this.chart.options && this.chart.options.startAngle ?
this.chart.options.startAngle :
0;
@@ -9950,7 +11707,7 @@ module.exports = function(Chart) {
var startAngleRadians = startAngle * Math.PI * 2 / 360;
// Start from the top instead of right, so remove a quarter of the circle
- return index * angleMultiplier - (Math.PI / 2) + startAngleRadians;
+ return index * angleMultiplier + startAngleRadians;
},
getDistanceFromCenterForValue: function(value) {
var me = this;
@@ -9963,13 +11720,12 @@ module.exports = function(Chart) {
var scalingFactor = me.drawingArea / (me.max - me.min);
if (me.options.reverse) {
return (me.max - value) * scalingFactor;
- } else {
- return (value - me.min) * scalingFactor;
}
+ return (value - me.min) * scalingFactor;
},
getPointPosition: function(index, distanceFromCenter) {
var me = this;
- var thisAngle = me.getIndexAngle(index);
+ var thisAngle = me.getIndexAngle(index) - (Math.PI / 2);
return {
x: Math.round(Math.cos(thisAngle) * distanceFromCenter) + me.xCenter,
y: Math.round(Math.sin(thisAngle) * distanceFromCenter) + me.yCenter
@@ -9996,8 +11752,6 @@ module.exports = function(Chart) {
var opts = me.options;
var gridLineOpts = opts.gridLines;
var tickOpts = opts.ticks;
- var angleLineOpts = opts.angleLines;
- var pointLabelOpts = opts.pointLabels;
var getValueOrDefault = helpers.getValueOrDefault;
if (opts.display) {
@@ -10017,29 +11771,7 @@ module.exports = function(Chart) {
// Draw circular lines around the scale
if (gridLineOpts.display && index !== 0) {
- ctx.strokeStyle = helpers.getValueAtIndexOrDefault(gridLineOpts.color, index - 1);
- ctx.lineWidth = helpers.getValueAtIndexOrDefault(gridLineOpts.lineWidth, index - 1);
-
- if (opts.lineArc) {
- // Draw circular arcs between the points
- ctx.beginPath();
- ctx.arc(me.xCenter, me.yCenter, yCenterOffset, 0, Math.PI * 2);
- ctx.closePath();
- ctx.stroke();
- } else {
- // Draw straight lines connecting each index
- ctx.beginPath();
- for (var i = 0; i < me.getValueCount(); i++) {
- var pointPosition = me.getPointPosition(i, yCenterOffset);
- if (i === 0) {
- ctx.moveTo(pointPosition.x, pointPosition.y);
- } else {
- ctx.lineTo(pointPosition.x, pointPosition.y);
- }
- }
- ctx.closePath();
- ctx.stroke();
- }
+ drawRadiusLine(me, gridLineOpts, yCenterOffset, index);
}
if (tickOpts.display) {
@@ -10058,7 +11790,7 @@ module.exports = function(Chart) {
}
ctx.textAlign = 'center';
- ctx.textBaseline = "middle";
+ ctx.textBaseline = 'middle';
ctx.fillStyle = tickFontColor;
ctx.fillText(label, me.xCenter, yHeight);
}
@@ -10066,70 +11798,18 @@ module.exports = function(Chart) {
});
if (!opts.lineArc) {
- ctx.lineWidth = angleLineOpts.lineWidth;
- ctx.strokeStyle = angleLineOpts.color;
-
- var outerDistance = me.getDistanceFromCenterForValue(opts.reverse ? me.min : me.max);
-
- // Point Label Font
- var pointLabelFontSize = getValueOrDefault(pointLabelOpts.fontSize, globalDefaults.defaultFontSize);
- var pointLabeFontStyle = getValueOrDefault(pointLabelOpts.fontStyle, globalDefaults.defaultFontStyle);
- var pointLabeFontFamily = getValueOrDefault(pointLabelOpts.fontFamily, globalDefaults.defaultFontFamily);
- var pointLabeFont = helpers.fontString(pointLabelFontSize, pointLabeFontStyle, pointLabeFontFamily);
-
- for (var i = me.getValueCount() - 1; i >= 0; i--) {
- if (angleLineOpts.display) {
- var outerPosition = me.getPointPosition(i, outerDistance);
- ctx.beginPath();
- ctx.moveTo(me.xCenter, me.yCenter);
- ctx.lineTo(outerPosition.x, outerPosition.y);
- ctx.stroke();
- ctx.closePath();
- }
- // Extra 3px out for some label spacing
- var pointLabelPosition = me.getPointPosition(i, outerDistance + 5);
-
- // Keep this in loop since we may support array properties here
- var pointLabelFontColor = getValueOrDefault(pointLabelOpts.fontColor, globalDefaults.defaultFontColor);
- ctx.font = pointLabeFont;
- ctx.fillStyle = pointLabelFontColor;
-
- var pointLabels = me.pointLabels;
-
- // Add quarter circle to make degree 0 mean top of circle
- var angleRadians = this.getIndexAngle(i) + (Math.PI / 2);
- var angle = (angleRadians * 360 / (2 * Math.PI)) % 360;
-
- if (angle === 0 || angle === 180) {
- ctx.textAlign = 'center';
- } else if (angle < 180) {
- ctx.textAlign = 'left';
- } else {
- ctx.textAlign = 'right';
- }
-
- // Set the correct text baseline based on outer positioning
- if (angle === 90 || angle === 270) {
- ctx.textBaseline = 'middle';
- } else if (angle > 270 || angle < 90) {
- ctx.textBaseline = 'bottom';
- } else {
- ctx.textBaseline = 'top';
- }
-
- ctx.fillText(pointLabels[i] ? pointLabels[i] : '', pointLabelPosition.x, pointLabelPosition.y);
- }
+ drawPointLabels(me);
}
}
}
});
- Chart.scaleService.registerScaleType("radialLinear", LinearRadialScale, defaultConfig);
+ Chart.scaleService.registerScaleType('radialLinear', LinearRadialScale, defaultConfig);
};
-},{}],44:[function(require,module,exports){
-/*global window: false */
-"use strict";
+},{}],48:[function(require,module,exports){
+/* global window: false */
+'use strict';
var moment = require(1);
moment = typeof(moment) === 'function' ? moment : window.moment;
@@ -10169,7 +11849,7 @@ module.exports = function(Chart) {
};
var defaultConfig = {
- position: "bottom",
+ position: 'bottom',
time: {
parser: false, // false == a pattern string from http://momentjs.com/docs/#/parsing/string-format/ or a custom callback that converts its argument to a moment
@@ -10178,18 +11858,19 @@ module.exports = function(Chart) {
round: false, // none, or override with week, month, year, etc.
displayFormat: false, // DEPRECATED
isoWeekday: false, // override week start day - see http://momentjs.com/docs/#/get-set/iso-weekday/
+ minUnit: 'millisecond',
// defaults to unit's corresponding unitFormat below or override using pattern string from http://momentjs.com/docs/#/displaying/format/
displayFormats: {
- 'millisecond': 'h:mm:ss.SSS a', // 11:20:01.123 AM,
- 'second': 'h:mm:ss a', // 11:20:01 AM
- 'minute': 'h:mm:ss a', // 11:20:01 AM
- 'hour': 'MMM D, hA', // Sept 4, 5PM
- 'day': 'll', // Sep 4 2015
- 'week': 'll', // Week 46, or maybe "[W]WW - YYYY" ?
- 'month': 'MMM YYYY', // Sept 2015
- 'quarter': '[Q]Q - YYYY', // Q3
- 'year': 'YYYY' // 2015
+ millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM,
+ second: 'h:mm:ss a', // 11:20:01 AM
+ minute: 'h:mm:ss a', // 11:20:01 AM
+ hour: 'MMM D, hA', // Sept 4, 5PM
+ day: 'll', // Sep 4 2015
+ week: 'll', // Week 46, or maybe "[W]WW - YYYY" ?
+ month: 'MMM YYYY', // Sept 2015
+ quarter: '[Q]Q - YYYY', // Q3
+ year: 'YYYY' // 2015
}
},
ticks: {
@@ -10206,19 +11887,38 @@ module.exports = function(Chart) {
Chart.Scale.prototype.initialize.call(this);
},
getLabelMoment: function(datasetIndex, index) {
- if (typeof this.labelMoments[datasetIndex] != 'undefined') {
+ if (datasetIndex === null || index === null) {
+ return null;
+ }
+
+ if (typeof this.labelMoments[datasetIndex] !== 'undefined') {
return this.labelMoments[datasetIndex][index];
}
return null;
},
+ getLabelDiff: function(datasetIndex, index) {
+ var me = this;
+ if (datasetIndex === null || index === null) {
+ return null;
+ }
+
+ if (me.labelDiffs === undefined) {
+ me.buildLabelDiffs();
+ }
+
+ if (typeof me.labelDiffs[datasetIndex] !== 'undefined') {
+ return me.labelDiffs[datasetIndex][index];
+ }
+
+ return null;
+ },
getMomentStartOf: function(tick) {
var me = this;
if (me.options.time.unit === 'week' && me.options.time.isoWeekday !== false) {
return tick.clone().startOf('isoWeek').isoWeekday(me.options.time.isoWeekday);
- } else {
- return tick.clone().startOf(me.tickUnit);
}
+ return tick.clone().startOf(me.tickUnit);
},
determineDataLimits: function() {
var me = this;
@@ -10288,6 +11988,46 @@ module.exports = function(Chart) {
me.firstTick = (me.firstTick || moment()).clone();
me.lastTick = (me.lastTick || moment()).clone();
},
+ buildLabelDiffs: function() {
+ var me = this;
+ me.labelDiffs = [];
+ var scaleLabelDiffs = [];
+ // Parse common labels once
+ if (me.chart.data.labels && me.chart.data.labels.length > 0) {
+ helpers.each(me.chart.data.labels, function(label) {
+ var labelMoment = me.parseTime(label);
+
+ if (labelMoment.isValid()) {
+ if (me.options.time.round) {
+ labelMoment.startOf(me.options.time.round);
+ }
+ scaleLabelDiffs.push(labelMoment.diff(me.firstTick, me.tickUnit, true));
+ }
+ }, me);
+ }
+
+ helpers.each(me.chart.data.datasets, function(dataset) {
+ var diffsForDataset = [];
+
+ if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) {
+ helpers.each(dataset.data, function(value) {
+ var labelMoment = me.parseTime(me.getRightValue(value));
+
+ if (labelMoment.isValid()) {
+ if (me.options.time.round) {
+ labelMoment.startOf(me.options.time.round);
+ }
+ diffsForDataset.push(labelMoment.diff(me.firstTick, me.tickUnit, true));
+ }
+ }, me);
+ } else {
+ // We have no labels. Use common ones
+ diffsForDataset = scaleLabelDiffs;
+ }
+
+ me.labelDiffs.push(diffsForDataset);
+ }, me);
+ },
buildTicks: function() {
var me = this;
@@ -10310,7 +12050,7 @@ module.exports = function(Chart) {
me.unitScale = helpers.getValueOrDefault(me.options.time.unitStepSize, 1);
} else {
// Determine the smallest needed unit of the time
- var innerWidth = me.isHorizontal() ? me.width - (me.paddingLeft + me.paddingRight) : me.height - (me.paddingTop + me.paddingBottom);
+ var innerWidth = me.isHorizontal() ? me.width : me.height;
// Crude approximation of what the label length might be
var tempFirstLabel = me.tickFormatFunction(me.firstTick, 0, []);
@@ -10321,7 +12061,7 @@ module.exports = function(Chart) {
var labelCapacity = innerWidth / (tickLabelWidth);
// Start as small as possible
- me.tickUnit = 'millisecond';
+ me.tickUnit = me.options.time.minUnit;
me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true);
me.displayFormat = me.options.time.displayFormats[me.tickUnit];
@@ -10334,7 +12074,7 @@ module.exports = function(Chart) {
me.unitScale = 1;
if (helpers.isArray(unitDefinition.steps) && Math.ceil(me.scaleSizeInUnits / labelCapacity) < helpers.max(unitDefinition.steps)) {
- // Use one of the prefedined steps
+ // Use one of the predefined steps
for (var idx = 0; idx < unitDefinition.steps.length; ++idx) {
if (unitDefinition.steps[idx] >= Math.ceil(me.scaleSizeInUnits / labelCapacity)) {
me.unitScale = helpers.getValueOrDefault(me.options.time.unitStepSize, unitDefinition.steps[idx]);
@@ -10394,7 +12134,7 @@ module.exports = function(Chart) {
me.ticks.push(me.firstTick.clone());
// For every unit in between the first and last moment, create a moment and add it to the ticks tick
- for (var i = 1; i <= me.scaleSizeInUnits; ++i) {
+ for (var i = me.unitScale; i <= me.scaleSizeInUnits; i += me.unitScale) {
var newTick = roundedStart.clone().add(i, me.tickUnit);
// Are we greater than the max time
@@ -10402,9 +12142,7 @@ module.exports = function(Chart) {
break;
}
- if (i % me.unitScale === 0) {
- me.ticks.push(newTick);
- }
+ me.ticks.push(newTick);
}
// Always show the right tick
@@ -10415,21 +12153,25 @@ module.exports = function(Chart) {
if (me.options.time.max) {
me.ticks.push(me.lastTick.clone());
me.scaleSizeInUnits = me.lastTick.diff(me.ticks[0], me.tickUnit, true);
- } else if (me.scaleSizeInUnits === 0) {
- me.ticks.push(me.lastTick.clone());
- me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true);
+ } else {
+ // me.ticks.push(me.lastTick.clone());
+ // me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true);
}
}
me.ctx.restore();
+
+ // Invalidate label diffs cache
+ me.labelDiffs = undefined;
},
// Get tooltip label
getLabelForIndex: function(index, datasetIndex) {
var me = this;
var label = me.chart.data.labels && index < me.chart.data.labels.length ? me.chart.data.labels[index] : '';
+ var value = me.chart.data.datasets[datasetIndex].data[index];
- if (typeof me.chart.data.datasets[datasetIndex].data[0] === 'object') {
- label = me.getRightValue(me.chart.data.datasets[datasetIndex].data[index]);
+ if (value !== null && typeof value === 'object') {
+ label = me.getRightValue(value);
}
// Format nicely
@@ -10447,9 +12189,8 @@ module.exports = function(Chart) {
if (callback) {
return callback(formattedTick, index, ticks);
- } else {
- return formattedTick;
}
+ return formattedTick;
},
convertTicksToLabels: function() {
var me = this;
@@ -10458,28 +12199,31 @@ module.exports = function(Chart) {
},
getPixelForValue: function(value, index, datasetIndex) {
var me = this;
- if (!value || !value.isValid) {
- // not already a moment object
- value = me.parseTime(me.getRightValue(value));
+ var offset = null;
+ if (index !== undefined && datasetIndex !== undefined) {
+ offset = me.getLabelDiff(datasetIndex, index);
}
- var labelMoment = value && value.isValid && value.isValid() ? value : me.getLabelMoment(datasetIndex, index);
- if (labelMoment) {
- var offset = labelMoment.diff(me.firstTick, me.tickUnit, true);
+ if (offset === null) {
+ if (!value || !value.isValid) {
+ // not already a moment object
+ value = me.parseTime(me.getRightValue(value));
+ }
+ if (value && value.isValid && value.isValid()) {
+ offset = value.diff(me.firstTick, me.tickUnit, true);
+ }
+ }
+ if (offset !== null) {
var decimal = offset !== 0 ? offset / me.scaleSizeInUnits : offset;
if (me.isHorizontal()) {
- var innerWidth = me.width - (me.paddingLeft + me.paddingRight);
- var valueOffset = (innerWidth * decimal) + me.paddingLeft;
-
+ var valueOffset = (me.width * decimal);
return me.left + Math.round(valueOffset);
- } else {
- var innerHeight = me.height - (me.paddingTop + me.paddingBottom);
- var heightOffset = (innerHeight * decimal) + me.paddingTop;
-
- return me.top + Math.round(heightOffset);
}
+
+ var heightOffset = (me.height * decimal);
+ return me.top + Math.round(heightOffset);
}
},
getPixelForTick: function(index) {
@@ -10487,8 +12231,8 @@ module.exports = function(Chart) {
},
getValueForPixel: function(pixel) {
var me = this;
- var innerDimension = me.isHorizontal() ? me.width - (me.paddingLeft + me.paddingRight) : me.height - (me.paddingTop + me.paddingBottom);
- var offset = (pixel - (me.isHorizontal() ? me.left + me.paddingLeft : me.top + me.paddingTop)) / innerDimension;
+ var innerDimension = me.isHorizontal() ? me.width : me.height;
+ var offset = (pixel - (me.isHorizontal() ? me.left : me.top)) / innerDimension;
offset *= me.scaleSizeInUnits;
return me.firstTick.clone().add(moment.duration(offset, me.tickUnit).asSeconds(), 'seconds');
},
@@ -10510,14 +12254,14 @@ module.exports = function(Chart) {
}
// Custom parsing (return an instance of moment)
if (typeof me.options.time.format !== 'string' && me.options.time.format.call) {
- console.warn("options.time.format is deprecated and replaced by options.time.parser. See http://nnnick.github.io/Chart.js/docs-v2/#scales-time-scale");
+ console.warn('options.time.format is deprecated and replaced by options.time.parser. See http://nnnick.github.io/Chart.js/docs-v2/#scales-time-scale');
return me.options.time.format(label);
}
// Moment format parsing
return moment(label, me.options.time.format);
}
});
- Chart.scaleService.registerScaleType("time", TimeScale, defaultConfig);
+ Chart.scaleService.registerScaleType('time', TimeScale, defaultConfig);
};