From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sun, 22 Jan 2017 18:23:42 +0000 (-0500)
Subject: remove unnecessary extra init steps
X-Git-Tag: v2.5.0~1^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1934358663ad16773082a44974da91f0be78b4e3;p=thirdparty%2FChart.js.git

remove unnecessary extra init steps
---

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 616df547b..1d2366152 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -121,13 +121,9 @@ module.exports = function(Chart) {
 				me.resize(true);
 			}
 
-			// Make sure controllers are built first so that each dataset is bound to an axis before the scales
-			// are built
+			// 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();
 
@@ -256,10 +252,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 = [];