From: Evert Timberg <evert.timberg@gmail.com>
Date: Sat, 12 Dec 2015 14:01:59 +0000 (-0500)
Subject: Merge branch 'v2.0-dev' into fix/1725
X-Git-Tag: 2.0.0-beta2~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1755%2Fhead;p=thirdparty%2FChart.js.git

Merge branch 'v2.0-dev' into fix/1725

Conflicts:
	src/core/core.controller.js
---

95332e39f517dbb312dd2518c3f87460a0be88a7
diff --cc src/core/core.controller.js
index b1fd23875,e9f1e87db..9a8304b3d
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@@ -212,8 -242,6 +240,8 @@@
  			// Make sure dataset controllers are updated and new controllers are reset
  			this.buildOrUpdateControllers(true);
  
- 			Chart.scaleService.update(this, this.chart.width, this.chart.height);
++			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();