From b4dfa38731973b28e76fd15f57d449ad2ee9b94f Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Sat, 4 Mar 2017 12:21:51 +0100
Subject: [PATCH] Fix shorthand `legend: false` and `title: false`

Prevent attempt to remove the legend or title layout items if they haven't been created but also check if the item to remove is registered with the layout manager to avoid removing the wrong box `splice(-1, 1)`. Add ids to the legend and title plugins to allow to fully disable them (`options: {plugins: {legend: false, title: false}}`).
---
 src/core/core.layoutService.js |  6 +++---
 src/core/core.legend.js        | 11 +++++++----
 src/core/core.title.js         | 12 +++++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/core/core.layoutService.js b/src/core/core.layoutService.js
index 9d40a2e407f..045a7490129 100644
--- a/src/core/core.layoutService.js
+++ b/src/core/core.layoutService.js
@@ -74,10 +74,10 @@ module.exports = function(Chart) {
 		 * @param {Object} layoutItem - the item to remove from the layout
 		 */
 		removeBox: function(chart, layoutItem) {
-			if (!chart.boxes) {
-				return;
+			var index = chart.boxes? chart.boxes.indexOf(layoutItem) : -1;
+			if (index !== -1) {
+				chart.boxes.splice(index, 1);
 			}
-			chart.boxes.splice(chart.boxes.indexOf(layoutItem), 1);
 		},
 
 		/**
diff --git a/src/core/core.legend.js b/src/core/core.legend.js
index aace498bfe1..b68f1de1a9c 100644
--- a/src/core/core.legend.js
+++ b/src/core/core.legend.js
@@ -509,6 +509,8 @@ module.exports = function(Chart) {
 
 	// Register the legend plugin
 	Chart.plugins.register({
+		id: 'legend',
+
 		beforeInit: function(chart) {
 			var legendOpts = chart.options.legend;
 
@@ -518,17 +520,18 @@ module.exports = function(Chart) {
 		},
 		beforeUpdate: function(chart) {
 			var legendOpts = chart.options.legend;
+			var legend = chart.legend;
 
 			if (legendOpts) {
 				legendOpts = helpers.configMerge(Chart.defaults.global.legend, legendOpts);
 
-				if (chart.legend) {
-					chart.legend.options = legendOpts;
+				if (legend) {
+					legend.options = legendOpts;
 				} else {
 					createNewLegendAndAttach(chart, legendOpts);
 				}
-			} else {
-				Chart.layoutService.removeBox(chart, chart.legend);
+			} else if (legend) {
+				Chart.layoutService.removeBox(chart, legend);
 				delete chart.legend;
 			}
 		},
diff --git a/src/core/core.title.js b/src/core/core.title.js
index fe7674d4ae1..eb060082433 100644
--- a/src/core/core.title.js
+++ b/src/core/core.title.js
@@ -18,7 +18,6 @@ module.exports = function(Chart) {
 
 	var noop = helpers.noop;
 	Chart.Title = Chart.Element.extend({
-
 		initialize: function(config) {
 			var me = this;
 			helpers.extend(me, config);
@@ -198,6 +197,8 @@ module.exports = function(Chart) {
 
 	// Register the title plugin
 	Chart.plugins.register({
+		id: 'title',
+
 		beforeInit: function(chart) {
 			var titleOpts = chart.options.title;
 
@@ -207,17 +208,18 @@ module.exports = function(Chart) {
 		},
 		beforeUpdate: function(chart) {
 			var titleOpts = chart.options.title;
+			var titleBlock = chart.titleBlock;
 
 			if (titleOpts) {
 				titleOpts = helpers.configMerge(Chart.defaults.global.title, titleOpts);
 
-				if (chart.titleBlock) {
-					chart.titleBlock.options = titleOpts;
+				if (titleBlock) {
+					titleBlock.options = titleOpts;
 				} else {
 					createNewTitleBlockAndAttach(chart, titleOpts);
 				}
-			} else {
-				Chart.layoutService.removeBox(chart, chart.titleBlock);
+			} else if (titleBlock) {
+				Chart.layoutService.removeBox(chart, titleBlock);
 				delete chart.titleBlock;
 			}
 		}