Updates based on feedback

Author: benmccann

karma.conf.js

@@ -78,7 +78,6 @@ module.exports = function(karma) {
 		// These settings deal with browser disconnects. We had seen test flakiness from Firefox
 		// [Firefox 56.0.0 (Linux 0.0.0)]: Disconnected (1 times), because no message in 10000 ms.
 		// https://github.com/jasmine/jasmine/issues/1327#issuecomment-332939551
-		browserNoActivityTimeout: 1000000,
 		browserDisconnectTolerance: 3
 	});
 

src/controllers/controller.line.js

@@ -26,10 +26,12 @@ defaults._set('line', {
 	}
 });
 
-defaults._set('dataset', {
-	line: {
-		showLine: true,
-		spanGaps: false
+defaults._set('global', {
+	datasets: {
+		line: {
+			showLine: true,
+			spanGaps: false
+		}
 	}
 });
 
@@ -48,9 +50,8 @@ module.exports = DatasetController.extend({
 		var lineElementOptions = options.elements.line;
 		var scale = me.getScaleForId(meta.yAxisID);
 		var dataset = me.getDataset();
-		var datasetDefaultOpts = me.getDatasetDefaultOpts();
-		var datasetUserOpts = me.getDatasetUserOptions();
-		var showLine = me._showLine = resolve([datasetUserOpts.showLine, options.showLines, datasetDefaultOpts.showLine]);
+		var datasetDefaults = me._defaults();
+		var showLine = me._showLine = resolve([dataset.showLine, options.showLines, datasetDefaults.showLine]);
 		var i, ilen, custom;
 
 		// Update Line
@@ -73,18 +74,18 @@ module.exports = DatasetController.extend({
 				// The default behavior of lines is to break at null values, according
 				// to https://github.com/chartjs/Chart.js/issues/2435#issuecomment-216718158
 				// This option gives lines the ability to span gaps
-				spanGaps: resolve([datasetUserOpts.spanGaps, options.spanGaps, datasetDefaultOpts.spanGaps]),
-				tension: resolve([custom.tension, dataset.lineTension, lineElementOptions.tension]),
-				backgroundColor: resolve([custom.backgroundColor, dataset.backgroundColor, lineElementOptions.backgroundColor]),
-				borderWidth: resolve([custom.borderWidth, dataset.borderWidth, lineElementOptions.borderWidth]),
-				borderColor: resolve([custom.borderColor, dataset.borderColor, lineElementOptions.borderColor]),
-				borderCapStyle: resolve([custom.borderCapStyle, dataset.borderCapStyle, lineElementOptions.borderCapStyle]),
-				borderDash: resolve([custom.borderDash, dataset.borderDash, lineElementOptions.borderDash]),
-				borderDashOffset: resolve([custom.borderDashOffset, dataset.borderDashOffset, lineElementOptions.borderDashOffset]),
-				borderJoinStyle: resolve([custom.borderJoinStyle, dataset.borderJoinStyle, lineElementOptions.borderJoinStyle]),
-				fill: resolve([custom.fill, dataset.fill, lineElementOptions.fill]),
-				steppedLine: resolve([custom.steppedLine, dataset.steppedLine, lineElementOptions.stepped]),
-				cubicInterpolationMode: resolve([custom.cubicInterpolationMode, dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode]),
+				spanGaps: resolve([dataset.spanGaps, options.spanGaps, datasetDefaults.spanGaps]),
+				tension: resolve([custom.tension, dataset.lineTension, lineElementOptions.tension, datasetDefaults.tension]),
+				backgroundColor: resolve([custom.backgroundColor, dataset.backgroundColor, lineElementOptions.backgroundColor, datasetDefaults.backgroundColor]),
+				borderWidth: resolve([custom.borderWidth, dataset.borderWidth, lineElementOptions.borderWidth, datasetDefaults.borderWidth]),
+				borderColor: resolve([custom.borderColor, dataset.borderColor, lineElementOptions.borderColor, datasetDefaults.borderColor]),
+				borderCapStyle: resolve([custom.borderCapStyle, dataset.borderCapStyle, lineElementOptions.borderCapStyle, datasetDefaults.borderCapStyle]),
+				borderDash: resolve([custom.borderDash, dataset.borderDash, lineElementOptions.borderDash, datasetDefaults.borderDash]),
+				borderDashOffset: resolve([custom.borderDashOffset, dataset.borderDashOffset, lineElementOptions.borderDashOffset, datasetDefaults.borderDashOffset]),
+				borderJoinStyle: resolve([custom.borderJoinStyle, dataset.borderJoinStyle, lineElementOptions.borderJoinStyle, datasetDefaults.borderJoinStyle]),
+				fill: resolve([custom.fill, dataset.fill, lineElementOptions.fill, datasetDefaults.fill]),
+				steppedLine: resolve([custom.steppedLine, dataset.steppedLine, lineElementOptions.stepped, datasetDefaults.steppedLine]),
+				cubicInterpolationMode: resolve([custom.cubicInterpolationMode, dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode, datasetDefaults.cubicInterpolationMode]),
 			};
 
 			line.pivot();

src/controllers/controller.scatter.js

@@ -33,9 +33,11 @@ defaults._set('scatter', {
 	}
 });
 
-defaults._set('dataset', {
-	scatter: {
-		showLine: false
+defaults._set('global', {
+	datasets: {
+		scatter: {
+			showLine: false
+		}
 	}
 });
 

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]);
 	},

src/core/core.datasetController.js

@@ -236,10 +236,20 @@ helpers.extend(DatasetController.prototype, {
 	},
 
 	/**
-	 * Returns the user-supplied dataset-level options
-	 * @protected
+	 * 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
 	 */
-	getDatasetUserOptions: function() {
+	_configure: function() {
 		var me = this;
 		var dataset = me.getDataset();
 		var datasetOptions = {};
@@ -252,18 +262,18 @@ helpers.extend(DatasetController.prototype, {
 				datasetOptions[key] = helpers.clone(dataset[key]);
 			}
 		}
-		return datasetOptions;
+		return helpers.merge({}, [datasetOptions, me._defaults()]);
 	},
 
 	/**
 	 * Returns the default dataset-level options
-	 * @protected
+	 * @private
 	 */
-	getDatasetDefaultOpts: function() {
+	_defaults: function() {
 		var me = this;
 		var dataset = me.getDataset();
 		var type = helpers.valueOrDefault(dataset.type, me.chart.config.type);
-		return defaults.dataset[type];
+		return defaults.global.datasets[type];
 	},
 
 	update: helpers.noop,