buildOrUpdateControllers now returns an array of all the new controllers that were...

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 654964c0b05924840aa951db586358bd2a4649a2..b0e1b08f7a185ce77d9c784229b59c2ab4adf9bf 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -208,8 +208,10 @@
                        Chart.layoutService.update(this, this.chart.width, this.chart.height);
                },
 
-               buildOrUpdateControllers: function buildOrUpdateControllers(resetNewControllers) {
+               buildOrUpdateControllers: function buildOrUpdateControllers() {
                        var types = [];
+                       var newControllers = [];
+
                        helpers.each(this.data.datasets, function(dataset, datasetIndex) {
                                if (!dataset.type) {
                                        dataset.type = this.config.type;
@@ -222,10 +224,7 @@
                                        dataset.controller.updateIndex(datasetIndex);
                                } else {
                                        dataset.controller = new Chart.controllers[type](this, datasetIndex);
-
-                                       if (resetNewControllers) {
-                                               dataset.controller.reset();
-                                       }
+                                       newControllers.push(dataset.controller);
                                }
                        }, this);
 
@@ -237,6 +236,8 @@
                                        }
                                }
                        }
+
+                       return newControllers;
                },
 
                resetElements: function resetElements() {
@@ -250,10 +251,15 @@
                        this.tooltip._data = this.data;
 
                        // Make sure dataset controllers are updated and new controllers are reset
-                       this.buildOrUpdateControllers(true);
+                       var newControllers = this.buildOrUpdateControllers();
 
                        Chart.layoutService.update(this, this.chart.width, this.chart.height);
 
+                       // Can only reset the new controllers after the scales have been updated
+                       helpers.each(newControllers, function(controller) {
+                               controller.reset();
+                       });
+
                        // Make sure all dataset controllers have correct meta data counts
                        helpers.each(this.data.datasets, function(dataset, datasetIndex) {
                                dataset.controller.buildOrUpdateElements();