archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1755 from nnnick/fix/1725

Browse Source 
Build controllers before scales are updated to ensure scale IDs are correct
This commit is contained in:
Evert Timberg 2015-12-12 09:05:39 -05:00
commit 47d04ced8f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/core.controller.js
View File

@ -208,13 +208,12 @@
if (dataset.controller) {
dataset.controller.updateIndex(datasetIndex);
return;
}
} else {
dataset.controller = new Chart.controllers[type](this, datasetIndex);
dataset.controller = new Chart.controllers[type](this, datasetIndex);
if (resetNewControllers) {
dataset.controller.reset();
if (resetNewControllers) {
dataset.controller.reset();
}
}
}, this);
@ -237,11 +236,12 @@
update: function update(animationDuration, lazy) {
// In case the entire data object changed
this.tooltip._data = this.data;
Chart.layoutService.update(this, this.chart.width, this.chart.height);
// Make sure dataset controllers are updated and new controllers are reset
this.buildOrUpdateControllers(true);
Chart.layoutService.update(this, this.chart.width, this.chart.height);
// Make sure all dataset controllers have correct meta data counts
helpers.each(this.data.datasets, function(dataset, datasetIndex) {
dataset.controller.buildOrUpdateElements();