Remove _update and _config methods. Move default options to defaults …

…scope
chartjs · Jan 22, 2019 · b2cdacc · b2cdacc
1 parent 0b86cf9
commit b2cdacc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 43 deletions.
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
@@ -26,12 +26,10 @@ defaults._set('line', {
 	}
 });
 
-defaults._set('global', {
-	datasets: {
-		line: {
-			showLine: true,
-			spanGaps: false
-		}
+defaults._set('datasets', {
+	line: {
+		showLine: true,
+		spanGaps: false
 	}
 });
 

diff --git a/src/controllers/controller.scatter.js b/src/controllers/controller.scatter.js
@@ -33,11 +33,9 @@ defaults._set('scatter', {
 	}
 });
 
-defaults._set('global', {
-	datasets: {
-		scatter: {
-			showLine: false
-		}
+defaults._set('datasets', {
+	scatter: {
+		showLine: false
 	}
 });
 

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
@@ -503,7 +503,7 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
 			return;
 		}
 
-		meta.controller._update();
+		meta.controller.update();
 
 		plugins.notify(me, 'afterDatasetUpdate', [args]);
 	},

diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
@@ -235,36 +235,6 @@ helpers.extend(DatasetController.prototype, {
 		me.resyncElements();
 	},
 
-	/**
-	 * Private functionality to be called before every update
-	 * @private
-	 */
-	_update: function() {
-		var me = this;
-		me._config = me._configure();
-		me.update.apply(me, arguments);
-	},
-
-	/**
-	 * Returns the merged user-supplied and default dataset-level options
-	 * @private
-	 */
-	_configure: function() {
-		var me = this;
-		var dataset = me.getDataset();
-		var datasetOptions = {};
-		var datasetKeys = Object.keys(dataset);
-		var nonOptionKeys = ['data', 'type', '_meta'];
-		var i, ilen, key;
-		for (i = 0, ilen = datasetKeys.length; i < ilen; i++) {
-			key = datasetKeys[i];
-			if (nonOptionKeys.indexOf(key) < 0) {
-				datasetOptions[key] = helpers.clone(dataset[key]);
-			}
-		}
-		return helpers.merge({}, [datasetOptions, me._defaults()]);
-	},
-
 	/**
 	 * Returns the default dataset-level options
 	 * @private
@@ -273,7 +243,7 @@ helpers.extend(DatasetController.prototype, {
 		var me = this;
 		var dataset = me.getDataset();
 		var type = helpers.valueOrDefault(dataset.type, me.chart.config.type);
-		return defaults.global.datasets[type];
+		return defaults.datasets[type];
 	},
 
 	update: helpers.noop,