From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Sat, 28 Jan 2017 11:50:29 +0000 (+0100)
Subject: Remove deprecated nested `chart` accesses
X-Git-Tag: v2.6.0~2^2~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13c61218764a3b542427dc45c812b8618a94571f;p=thirdparty%2FChart.js.git

Remove deprecated nested `chart` accesses
---

diff --git a/samples/data_labelling.html b/samples/data_labelling.html
index 939e517a9..4b6b19e16 100644
--- a/samples/data_labelling.html
+++ b/samples/data_labelling.html
@@ -30,12 +30,12 @@
                 backgroundColor: color(window.chartColors.red).alpha(0.2).rgbString(),
                 borderColor: window.chartColors.red,
                 data: [
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
                     randomScalingFactor(),
-                    randomScalingFactor(), 
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
                     randomScalingFactor()
                 ]
             }, {
@@ -44,12 +44,12 @@
                 backgroundColor: color(window.chartColors.blue).alpha(0.2).rgbString(),
                 borderColor: window.chartColors.blue,
                 data: [
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
                     randomScalingFactor(),
-                    randomScalingFactor(), 
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
                     randomScalingFactor()
                 ]
             }, {
@@ -58,12 +58,12 @@
                 backgroundColor: color(window.chartColors.green).alpha(0.2).rgbString(),
                 borderColor: window.chartColors.green,
                 data: [
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
-                    randomScalingFactor(), 
                     randomScalingFactor(),
-                    randomScalingFactor(), 
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
+                    randomScalingFactor(),
                     randomScalingFactor()
                 ]
             }]
@@ -73,7 +73,7 @@
         Chart.plugins.register({
             afterDatasetsDraw: function(chartInstance, easing) {
                 // To only draw at the end of animation, check for easing === 1
-                var ctx = chartInstance.chart.ctx;
+                var ctx = chartInstance.ctx;
 
                 chartInstance.data.datasets.forEach(function (dataset, i) {
                     var meta = chartInstance.getDatasetMeta(i);
@@ -120,7 +120,7 @@
 
         document.getElementById('randomizeData').addEventListener('click', function() {
             barChartData.datasets.forEach(function(dataset) {
-                dataset.data = dataset.data.map(function() { 
+                dataset.data = dataset.data.map(function() {
                     return randomScalingFactor();
                 })
             });
diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 1d41386b6..cd746701e 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -143,7 +143,7 @@ module.exports = function(Chart) {
 			var xScale = me.getScaleForId(meta.xAxisID);
 			var stackCount = me.getStackCount();
 
-			var 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 / stackCount;
@@ -169,7 +169,7 @@ module.exports = function(Chart) {
 			if (xScale.options.barThickness) {
 				return xScale.options.barThickness;
 			}
-			return ruler.barWidth;
+			return ruler.barWidth;
 		},
 
 		// Get stack index from the given dataset index accounting for stacks and the fact that not all bars are visible
@@ -219,7 +219,7 @@ module.exports = function(Chart) {
 				(yScale.options.stacked === undefined && meta.stack !== undefined)) {
 				var base = yScale.getBaseValue();
 				var sumPos = base,
-					sumNeg = base;
+					sumNeg = base;
 
 				for (var i = 0; i < datasetIndex; i++) {
 					var ds = me.chart.data.datasets[i];
@@ -246,19 +246,20 @@ module.exports = function(Chart) {
 
 		draw: function(ease) {
 			var me = this;
+			var chart = me.chart;
 			var easingDecimal = ease || 1;
 			var metaData = me.getMeta().data;
 			var dataset = me.getDataset();
 			var i, len;
 
-			Chart.canvasHelpers.clipArea(me.chart.chart.ctx, me.chart.chartArea);
+			Chart.canvasHelpers.clipArea(chart.ctx, chart.chartArea);
 			for (i = 0, len = metaData.length; i < len; ++i) {
 				var d = dataset.data[i];
 				if (d !== null && d !== undefined && !isNaN(d)) {
 					metaData[i].transition(easingDecimal).draw();
 				}
 			}
-			Chart.canvasHelpers.unclipArea(me.chart.chart.ctx);
+			Chart.canvasHelpers.unclipArea(chart.ctx);
 		},
 
 		setHoverStyle: function(rectangle) {
@@ -483,7 +484,7 @@ module.exports = function(Chart) {
 				}
 			}
 
-			return stacks.length - 1;
+			return stacks.length - 1;
 		},
 
 		calculateBarX: function(index, datasetIndex) {
@@ -496,7 +497,7 @@ module.exports = function(Chart) {
 				(xScale.options.stacked === undefined && meta.stack !== undefined)) {
 				var base = xScale.getBaseValue();
 				var sumPos = base,
-					sumNeg = base;
+					sumNeg = base;
 
 				for (var i = 0; i < datasetIndex; i++) {
 					var ds = me.chart.data.datasets[i];
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 806ab4f3f..577ed75e2 100644
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -282,6 +282,7 @@ module.exports = function(Chart) {
 
 		draw: function(ease) {
 			var me = this;
+			var chart = me.chart;
 			var meta = me.getMeta();
 			var points = meta.data || [];
 			var easingDecimal = ease || 1;
@@ -292,16 +293,16 @@ module.exports = function(Chart) {
 				points[i].transition(easingDecimal);
 			}
 
-			Chart.canvasHelpers.clipArea(me.chart.chart.ctx, me.chart.chartArea);
+			Chart.canvasHelpers.clipArea(chart.ctx, chart.chartArea);
 			// Transition and Draw the line
-			if (lineEnabled(me.getDataset(), me.chart.options)) {
+			if (lineEnabled(me.getDataset(), chart.options)) {
 				meta.dataset.transition(easingDecimal).draw();
 			}
-			Chart.canvasHelpers.unclipArea(me.chart.chart.ctx);
+			Chart.canvasHelpers.unclipArea(chart.ctx);
 
 			// Draw the points
 			for (i=0, ilen=points.length; i<ilen; ++i) {
-				points[i].draw(me.chart.chartArea);
+				points[i].draw(chart.chartArea);
 			}
 		},
 
diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 070aa0356..bf9739298 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -122,7 +122,7 @@ module.exports = function(Chart) {
 			// Before init plugin notification
 			plugins.notify(me, 'beforeInit');
 
-			helpers.retinaScale(me.chart);
+			helpers.retinaScale(me);
 
 			me.bindEvents();
 
@@ -143,7 +143,7 @@ module.exports = function(Chart) {
 		},
 
 		clear: function() {
-			helpers.clear(this.chart);
+			helpers.clear(this);
 			return this;
 		},
 
@@ -155,26 +155,25 @@ module.exports = function(Chart) {
 
 		resize: function(silent) {
 			var me = this;
-			var chart = me.chart;
 			var options = me.options;
-			var canvas = chart.canvas;
-			var aspectRatio = (options.maintainAspectRatio && chart.aspectRatio) || null;
+			var canvas = me.canvas;
+			var aspectRatio = (options.maintainAspectRatio && me.aspectRatio) || null;
 
 			// 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 (chart.width === newWidth && chart.height === newHeight) {
+			if (me.width === newWidth && me.height === newHeight) {
 				return;
 			}
 
-			canvas.width = chart.width = newWidth;
-			canvas.height = chart.height = newHeight;
+			canvas.width = me.width = newWidth;
+			canvas.height = me.height = newHeight;
 			canvas.style.width = newWidth + 'px';
 			canvas.style.height = newHeight + 'px';
 
-			helpers.retinaScale(chart);
+			helpers.retinaScale(me);
 
 			if (!silent) {
 				// Notify any plugins about the resize
@@ -244,7 +243,7 @@ module.exports = function(Chart) {
 				var scale = new scaleClass({
 					id: scaleOptions.id,
 					options: scaleOptions,
-					ctx: me.chart.ctx,
+					ctx: me.ctx,
 					chart: me
 				});
 
@@ -367,7 +366,7 @@ module.exports = function(Chart) {
 				return;
 			}
 
-			Chart.layoutService.update(this, this.chart.width, this.chart.height);
+			Chart.layoutService.update(this, this.width, this.height);
 
 			/**
 			 * Provided for backward compatibility, use `afterLayout` instead.
@@ -567,7 +566,7 @@ module.exports = function(Chart) {
 
 		destroy: function() {
 			var me = this;
-			var canvas = me.chart.canvas;
+			var canvas = me.canvas;
 			var meta, i, ilen;
 
 			me.stop();
@@ -583,10 +582,10 @@ module.exports = function(Chart) {
 
 			if (canvas) {
 				me.unbindEvents();
-				helpers.clear(me.chart);
-				platform.releaseContext(me.chart.ctx);
-				me.chart.canvas = null;
-				me.chart.ctx = null;
+				helpers.clear(me);
+				platform.releaseContext(me.ctx);
+				me.canvas = null;
+				me.ctx = null;
 			}
 
 			plugins.notify(me, 'destroy');
@@ -595,13 +594,13 @@ module.exports = function(Chart) {
 		},
 
 		toBase64Image: function() {
-			return this.chart.canvas.toDataURL.apply(this.chart.canvas, arguments);
+			return this.canvas.toDataURL.apply(this.canvas, arguments);
 		},
 
 		initToolTip: function() {
 			var me = this;
 			me.tooltip = new Chart.Tooltip({
-				_chart: me.chart,
+				_chart: me,
 				_chartInstance: me,
 				_data: me.data,
 				_options: me.options.tooltips
diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
index 2e218dfe9..afd5ea37d 100644
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@ -148,7 +148,7 @@ module.exports = function(Chart) {
 			var me = this;
 			var type = me.datasetElementType;
 			return type && new type({
-				_chart: me.chart.chart,
+				_chart: me.chart,
 				_datasetIndex: me.index
 			});
 		},
@@ -157,7 +157,7 @@ module.exports = function(Chart) {
 			var me = this;
 			var type = me.dataElementType;
 			return type && new type({
-				_chart: me.chart.chart,
+				_chart: me.chart,
 				_datasetIndex: me.index,
 				_index: index
 			});
diff --git a/src/core/core.interaction.js b/src/core/core.interaction.js
index 03423c0d6..53a479f61 100644
--- a/src/core/core.interaction.js
+++ b/src/core/core.interaction.js
@@ -99,7 +99,7 @@ module.exports = function(Chart) {
 	}
 
 	function indexMode(chart, e, options) {
-		var position = getRelativePosition(e, chart.chart);
+		var position = getRelativePosition(e, chart);
 		var distanceMetric = function(pt1, pt2) {
 			return Math.abs(pt1.x - pt2.x);
 		};
@@ -142,7 +142,7 @@ module.exports = function(Chart) {
 		// Helper function for different modes
 		modes: {
 			single: function(chart, e) {
-				var position = getRelativePosition(e, chart.chart);
+				var position = getRelativePosition(e, chart);
 				var elements = [];
 
 				parseVisibleItems(chart, function(element) {
@@ -183,7 +183,7 @@ module.exports = function(Chart) {
 			 * @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 position = getRelativePosition(e, chart);
 				var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false);
 
 				if (items.length > 0) {
@@ -210,7 +210,7 @@ module.exports = function(Chart) {
 			 * @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);
+				var position = getRelativePosition(e, chart);
 				return getIntersectItems(chart, position);
 			},
 
@@ -223,7 +223,7 @@ module.exports = function(Chart) {
 			 * @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 position = getRelativePosition(e, chart);
 				var nearestItems = getNearestItems(chart, position, options.intersect);
 
 				// We have multiple items at the same distance from the event. Now sort by smallest
@@ -255,7 +255,7 @@ module.exports = function(Chart) {
 			 * @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 position = getRelativePosition(e, chart);
 				var items = [];
 				var intersectsItem = false;
 
@@ -286,7 +286,7 @@ module.exports = function(Chart) {
 			 * @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 position = getRelativePosition(e, chart);
 				var items = [];
 				var intersectsItem = false;
 
diff --git a/src/core/core.legend.js b/src/core/core.legend.js
index 4816b285f..9874adfea 100644
--- a/src/core/core.legend.js
+++ b/src/core/core.legend.js
@@ -493,7 +493,7 @@ module.exports = function(Chart) {
 
 	function createNewLegendAndAttach(chartInstance, legendOpts) {
 		var legend = new Chart.Legend({
-			ctx: chartInstance.chart.ctx,
+			ctx: chartInstance.ctx,
 			options: legendOpts,
 			chart: chartInstance
 		});
diff --git a/src/core/core.title.js b/src/core/core.title.js
index 5b2d989f8..8e1416497 100644
--- a/src/core/core.title.js
+++ b/src/core/core.title.js
@@ -183,7 +183,7 @@ module.exports = function(Chart) {
 
 	function createNewTitleBlockAndAttach(chartInstance, titleOpts) {
 		var title = new Chart.Title({
-			ctx: chartInstance.chart.ctx,
+			ctx: chartInstance.ctx,
 			options: titleOpts,
 			chart: chartInstance
 		});
diff --git a/src/platforms/platform.dom.js b/src/platforms/platform.dom.js
index abfb3dee3..de451b935 100644
--- a/src/platforms/platform.dom.js
+++ b/src/platforms/platform.dom.js
@@ -240,24 +240,24 @@ module.exports = function(Chart) {
 		},
 
 		addEventListener: function(chart, type, listener) {
-			var canvas = chart.chart.canvas;
+			var canvas = chart.canvas;
 			if (type === 'resize') {
 				// Note: the resize event is not supported on all browsers.
-				addResizeListener(canvas.parentNode, listener, chart.chart);
+				addResizeListener(canvas.parentNode, listener, 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));
+				listener(fromNativeEvent(event, chart));
 			};
 
 			helpers.addEvent(canvas, type, proxy);
 		},
 
 		removeEventListener: function(chart, type, listener) {
-			var canvas = chart.chart.canvas;
+			var canvas = chart.canvas;
 			if (type === 'resize') {
 				// Note: the resize event is not supported on all browsers.
 				removeResizeListener(canvas.parentNode, listener);
diff --git a/test/core.controller.tests.js b/test/core.controller.tests.js
index da4b77d1d..9c5e9e26d 100644
--- a/test/core.controller.tests.js
+++ b/test/core.controller.tests.js
@@ -1,7 +1,7 @@
 describe('Chart.Controller', function() {
 
 	function waitForResize(chart, callback) {
-		var resizer = chart.chart.canvas.parentNode._chartjs.resizer;
+		var resizer = chart.canvas.parentNode._chartjs.resizer;
 		var content = resizer.contentWindow || resizer;
 		var state = content.document.readyState || 'complete';
 		var handler = function() {
@@ -104,7 +104,7 @@ describe('Chart.Controller', function() {
 				}
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			expect(wrapper.childNodes.length).toBe(1);
 			expect(wrapper.firstChild.tagName).toBe('CANVAS');
 		});
@@ -152,7 +152,7 @@ describe('Chart.Controller', function() {
 				rw: 300, rh: 350,
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			wrapper.style.width = '455px';
 			waitForResize(chart, function() {
 				expect(chart).toBeChartOfSize({
@@ -192,7 +192,7 @@ describe('Chart.Controller', function() {
 				rw: 300, rh: 350,
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			wrapper.style.height = '455px';
 			waitForResize(chart, function() {
 				expect(chart).toBeChartOfSize({
@@ -233,7 +233,7 @@ describe('Chart.Controller', function() {
 				rw: 320, rh: 350,
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			wrapper.style.height = '355px';
 			wrapper.style.width = '455px';
 			waitForResize(chart, function() {
@@ -261,7 +261,7 @@ describe('Chart.Controller', function() {
 				}
 			});
 
-			var canvas = chart.chart.canvas;
+			var canvas = chart.canvas;
 			canvas.style.display = 'block';
 			waitForResize(chart, function() {
 				expect(chart).toBeChartOfSize({
@@ -288,7 +288,7 @@ describe('Chart.Controller', function() {
 				}
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			wrapper.style.display = 'block';
 			waitForResize(chart, function() {
 				expect(chart).toBeChartOfSize({
@@ -321,7 +321,7 @@ describe('Chart.Controller', function() {
 				rw: 320, rh: 350,
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			var parent = wrapper.parentNode;
 			parent.removeChild(wrapper);
 			parent.appendChild(wrapper);
@@ -371,7 +371,7 @@ describe('Chart.Controller', function() {
 				rw: 300, rh: 150,
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			wrapper.style.width = '450px';
 			waitForResize(chart, function() {
 				expect(chart).toBeChartOfSize({
@@ -411,7 +411,7 @@ describe('Chart.Controller', function() {
 				rw: 320, rh: 160,
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			wrapper.style.height = '455px';
 			waitForResize(chart, function() {
 				expect(chart).toBeChartOfSize({
@@ -487,7 +487,7 @@ describe('Chart.Controller', function() {
 				}
 			});
 
-			var wrapper = chart.chart.canvas.parentNode;
+			var wrapper = chart.canvas.parentNode;
 			var resizer = wrapper.firstChild;
 
 			expect(wrapper.childNodes.length).toBe(2);
@@ -635,7 +635,7 @@ describe('Chart.Controller', function() {
 				}
 			});
 
-			chart.chart.canvas.parentNode.style.width = '400px';
+			chart.canvas.parentNode.style.width = '400px';
 			waitForResize(chart, function() {
 				chart.destroy();
 
diff --git a/test/core.interaction.tests.js b/test/core.interaction.tests.js
index 7d8e339ca..fedcbfad8 100644
--- a/test/core.interaction.tests.js
+++ b/test/core.interaction.tests.js
@@ -27,7 +27,7 @@ describe('Core.Interaction', function() {
 			var meta1 = chartInstance.getDatasetMeta(1);
 			var point = meta0.data[1];
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 
 			var evt = {
@@ -63,7 +63,7 @@ describe('Core.Interaction', function() {
 			});
 
 			// Trigger an event at (0, 0)
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var evt = {
 				view: window,
 				bubbles: true,
@@ -103,7 +103,7 @@ describe('Core.Interaction', function() {
 			var meta1 = chartInstance.getDatasetMeta(1);
 			var point = meta0.data[1];
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 
 			var evt = {
@@ -142,7 +142,7 @@ describe('Core.Interaction', function() {
 			var meta0 = chartInstance.getDatasetMeta(0);
 			var meta1 = chartInstance.getDatasetMeta(1);
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 
 			var evt = {
@@ -183,7 +183,7 @@ describe('Core.Interaction', function() {
 			var meta = chartInstance.getDatasetMeta(0);
 			var point = meta.data[1];
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 
 			var evt = {
@@ -218,7 +218,7 @@ describe('Core.Interaction', function() {
 				}
 			});
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 
 			var evt = {
@@ -259,7 +259,7 @@ describe('Core.Interaction', function() {
 
 			// Trigger an event over top of the
 			var meta = chartInstance.getDatasetMeta(1);
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var evt = {
 				view: window,
 				bubbles: true,
@@ -305,7 +305,7 @@ describe('Core.Interaction', function() {
 				y: (meta0.data[1]._view.y + meta1.data[1]._view.y) / 2
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -352,7 +352,7 @@ describe('Core.Interaction', function() {
 				y: (meta0.data[1]._view.y + meta1.data[1]._view.y) / 2
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -393,7 +393,7 @@ describe('Core.Interaction', function() {
 			var meta = chartInstance.getDatasetMeta(1);
 			var point = meta.data[1];
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -450,7 +450,7 @@ describe('Core.Interaction', function() {
 				y: meta0.data[1]._view.y
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -496,7 +496,7 @@ describe('Core.Interaction', function() {
 				y: meta0.data[1]._view.y
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -542,7 +542,7 @@ describe('Core.Interaction', function() {
 				y: meta0.data[1]._view.y
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -591,7 +591,7 @@ describe('Core.Interaction', function() {
 				y: meta0.data[1]._view.y
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -649,7 +649,7 @@ describe('Core.Interaction', function() {
 				y: meta0.data[1]._view.y
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -709,7 +709,7 @@ describe('Core.Interaction', function() {
 				y: meta0.data[1]._view.y
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
@@ -767,7 +767,7 @@ describe('Core.Interaction', function() {
 				y: meta0.data[1]._view.y
 			};
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 			var evt = {
 				view: window,
diff --git a/test/core.tooltip.tests.js b/test/core.tooltip.tests.js
index d96dfa302..f4d409466 100755
--- a/test/core.tooltip.tests.js
+++ b/test/core.tooltip.tests.js
@@ -30,7 +30,7 @@ describe('Core.Tooltip', function() {
 			var meta = chartInstance.getDatasetMeta(0);
 			var point = meta.data[1];
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 
 			var evt = new MouseEvent('mousemove', {
@@ -146,7 +146,7 @@ describe('Core.Tooltip', function() {
 			var meta = chartInstance.getDatasetMeta(0);
 			var point = meta.data[1];
 
-			var node = chartInstance.chart.canvas;
+			var node = chartInstance.canvas;
 			var rect = node.getBoundingClientRect();
 
 			var evt = new MouseEvent('mousemove', {
@@ -234,7 +234,7 @@ describe('Core.Tooltip', function() {
 		var meta = chartInstance.getDatasetMeta(0);
 		var point = meta.data[1];
 
-		var node = chartInstance.chart.canvas;
+		var node = chartInstance.canvas;
 		var rect = node.getBoundingClientRect();
 
 		var evt = new MouseEvent('mousemove', {
@@ -377,7 +377,7 @@ describe('Core.Tooltip', function() {
 		var meta = chartInstance.getDatasetMeta(0);
 		var point = meta.data[1];
 
-		var node = chartInstance.chart.canvas;
+		var node = chartInstance.canvas;
 		var rect = node.getBoundingClientRect();
 
 		var evt = new MouseEvent('mousemove', {
@@ -494,7 +494,7 @@ describe('Core.Tooltip', function() {
 		var meta0 = chartInstance.getDatasetMeta(0);
 		var point0 = meta0.data[1];
 
-		var node = chartInstance.chart.canvas;
+		var node = chartInstance.canvas;
 		var rect = node.getBoundingClientRect();
 
 		var evt = new MouseEvent('mousemove', {
@@ -576,7 +576,7 @@ describe('Core.Tooltip', function() {
 		var meta0 = chartInstance.getDatasetMeta(0);
 		var point0 = meta0.data[1];
 
-		var node = chartInstance.chart.canvas;
+		var node = chartInstance.canvas;
 		var rect = node.getBoundingClientRect();
 
 		var evt = new MouseEvent('mousemove', {
@@ -644,7 +644,7 @@ describe('Core.Tooltip', function() {
 		var datasetIndex = 0;
 		var meta = chartInstance.getDatasetMeta(datasetIndex);
 		var point = meta.data[pointIndex];
-		var node = chartInstance.chart.canvas;
+		var node = chartInstance.canvas;
 		var rect = node.getBoundingClientRect();
 		var evt = new MouseEvent('mousemove', {
 			view: window,
diff --git a/test/mockContext.js b/test/mockContext.js
index 0d1238477..b6d2c13f5 100644
--- a/test/mockContext.js
+++ b/test/mockContext.js
@@ -177,20 +177,17 @@
 	function toBeValidChart() {
 		return {
 			compare: function(actual) {
-				var chart = actual && actual.chart;
 				var message = null;
 
-				if (!(actual instanceof Chart.Controller)) {
-					message = 'Expected ' + actual + ' to be an instance of Chart.Controller';
-				} else if (!(chart instanceof Chart)) {
-					message = 'Expected chart to be an instance of Chart';
-				} else if (!(chart.canvas instanceof HTMLCanvasElement)) {
+				if (!(actual instanceof Chart)) {
+					message = 'Expected ' + actual + ' to be an instance of Chart';
+				} else if (!(actual.canvas instanceof HTMLCanvasElement)) {
 					message = 'Expected canvas to be an instance of HTMLCanvasElement';
-				} else if (!(chart.ctx instanceof CanvasRenderingContext2D)) {
+				} else if (!(actual.ctx instanceof CanvasRenderingContext2D)) {
 					message = 'Expected context to be an instance of CanvasRenderingContext2D';
-				} else if (typeof chart.height !== 'number' || !isFinite(chart.height)) {
+				} else if (typeof actual.height !== 'number' || !isFinite(actual.height)) {
 					message = 'Expected height to be a strict finite number';
-				} else if (typeof chart.width !== 'number' || !isFinite(chart.width)) {
+				} else if (typeof actual.width !== 'number' || !isFinite(actual.width)) {
 					message = 'Expected width to be a strict finite number';
 				}
 
@@ -211,8 +208,7 @@
 				}
 
 				var message = null;
-				var chart = actual.chart;
-				var canvas = chart.ctx.canvas;
+				var canvas = actual.ctx.canvas;
 				var style = getComputedStyle(canvas);
 				var pixelRatio = window.devicePixelRatio;
 				var dh = parseInt(style.height, 10);
@@ -223,10 +219,10 @@
 				var orw = rw / pixelRatio;
 
 				// sanity checks
-				if (chart.height !== orh) {
-					message = 'Expected chart height ' + chart.height + ' to be equal to original render height ' + orh;
-				} else if (chart.width !== orw) {
-					message = 'Expected chart width ' + chart.width + ' to be equal to original render width ' + orw;
+				if (actual.height !== orh) {
+					message = 'Expected chart height ' + actual.height + ' to be equal to original render height ' + orh;
+				} else if (actual.width !== orw) {
+					message = 'Expected chart width ' + actual.width + ' to be equal to original render width ' + orw;
 				}
 
 				// validity checks
diff --git a/test/platform.dom.tests.js b/test/platform.dom.tests.js
index a022cc75d..06562c919 100644
--- a/test/platform.dom.tests.js
+++ b/test/platform.dom.tests.js
@@ -1,7 +1,7 @@
 describe('Platform.dom', function() {
 
 	function waitForResize(chart, callback) {
-		var resizer = chart.chart.canvas.parentNode._chartjs.resizer;
+		var resizer = chart.canvas.parentNode._chartjs.resizer;
 		var content = resizer.contentWindow || resizer;
 		var state = content.document.readyState || 'complete';
 		var handler = function() {
@@ -40,8 +40,8 @@ describe('Platform.dom', function() {
 			var chart = new Chart(canvasId);
 
 			expect(chart).toBeValidChart();
-			expect(chart.chart.canvas).toBe(canvas);
-			expect(chart.chart.ctx).toBe(canvas.getContext('2d'));
+			expect(chart.canvas).toBe(canvas);
+			expect(chart.ctx).toBe(canvas.getContext('2d'));
 
 			chart.destroy();
 		});
@@ -51,8 +51,8 @@ describe('Platform.dom', function() {
 			var chart = new Chart(canvas);
 
 			expect(chart).toBeValidChart();
-			expect(chart.chart.canvas).toBe(canvas);
-			expect(chart.chart.ctx).toBe(canvas.getContext('2d'));
+			expect(chart.canvas).toBe(canvas);
+			expect(chart.ctx).toBe(canvas.getContext('2d'));
 
 			chart.destroy();
 		});
@@ -63,8 +63,8 @@ describe('Platform.dom', function() {
 			var chart = new Chart(context);
 
 			expect(chart).toBeValidChart();
-			expect(chart.chart.canvas).toBe(canvas);
-			expect(chart.chart.ctx).toBe(context);
+			expect(chart.canvas).toBe(canvas);
+			expect(chart.ctx).toBe(context);
 
 			chart.destroy();
 		});
@@ -74,8 +74,8 @@ describe('Platform.dom', function() {
 			var chart = new Chart([canvas]);
 
 			expect(chart).toBeValidChart();
-			expect(chart.chart.canvas).toBe(canvas);
-			expect(chart.chart.ctx).toBe(canvas.getContext('2d'));
+			expect(chart.canvas).toBe(canvas);
+			expect(chart.ctx).toBe(canvas.getContext('2d'));
 
 			chart.destroy();
 		});
@@ -254,7 +254,7 @@ describe('Platform.dom', function() {
 	describe('controller.destroy', function() {
 		it('should reset context to default values', function() {
 			var chart = acquireChart({});
-			var context = chart.chart.ctx;
+			var context = chart.ctx;
 
 			chart.destroy();
 
@@ -294,7 +294,7 @@ describe('Platform.dom', function() {
 				}
 			});
 
-			var canvas = chart.chart.canvas;
+			var canvas = chart.canvas;
 			var wrapper = canvas.parentNode;
 			wrapper.style.width = '475px';
 			waitForResize(chart, function() {
@@ -338,7 +338,7 @@ describe('Platform.dom', function() {
 				plugins: [plugin]
 			});
 
-			var node = chart.chart.canvas;
+			var node = chart.canvas;
 			var rect = node.getBoundingClientRect();
 			var clientX = (rect.left + rect.right) / 2;
 			var clientY = (rect.top + rect.bottom) / 2;
@@ -362,8 +362,8 @@ describe('Platform.dom', function() {
 			expect(notifiedEvent.type).toBe(evt.type);
 
 			// Relative Position
-			expect(notifiedEvent.x).toBe(chart.chart.width / 2);
-			expect(notifiedEvent.y).toBe(chart.chart.height / 2);
+			expect(notifiedEvent.x).toBe(chart.width / 2);
+			expect(notifiedEvent.y).toBe(chart.height / 2);
 		});
 	});
 });