Divide core.helpers monolith

samples/advanced/data-labelling.html

@@ -21,7 +21,7 @@
 	</div>
 	<button id="randomizeData">Randomize Data</button>
 	<script>
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var barChartData = {
 			labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
 			datasets: [{
@@ -84,7 +84,7 @@
 							var fontSize = 16;
 							var fontStyle = 'normal';
 							var fontFamily = 'Helvetica Neue';
-							ctx.font = Chart.helpers.fontString(fontSize, fontStyle, fontFamily);
+							ctx.font = Chart.helpers.canvas.fontString(fontSize, fontStyle, fontFamily);
 
 							// Just naively convert to string for now
 							var dataString = dataset.data[index].toString();

samples/charts/bar/horizontal.html

@@ -25,7 +25,7 @@
 	<button id="removeData">Remove Data</button>
 	<script>
 		var MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var horizontalBarChartData = {
 			labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
 			datasets: [{

samples/charts/bar/vertical.html

@@ -25,7 +25,7 @@
 	<button id="removeData">Remove Data</button>
 	<script>
 		var MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var barChartData = {
 			labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
 			datasets: [{

samples/charts/bubble.html

@@ -27,7 +27,7 @@
 		var DEFAULT_DATASET_SIZE = 7;
 
 		var addedCount = 0;
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var bubbleChartData = {
 			animation: {
 				duration: 10000

samples/charts/polar-area.html

@@ -27,7 +27,7 @@
 		};
 
 		var chartColors = window.chartColors;
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var config = {
 			data: {
 				datasets: [{

samples/charts/radar-skip-points.html

@@ -24,7 +24,7 @@
 			return Math.round(Math.random() * 100);
 		};
 
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var config = {
 			type: 'radar',
 			data: {

samples/charts/radar.html

@@ -28,7 +28,7 @@
 			return Math.round(Math.random() * 100);
 		};
 
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var config = {
 			type: 'radar',
 			data: {

samples/charts/scatter/basic.html

@@ -20,7 +20,7 @@
 	</div>
 	<button id="randomizeData">Randomize Data</button>
 	<script>
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		function generateData() {
 			var data = [];
 			for (var i = 0; i < 7; i++) {

samples/charts/scatter/multi-axis.html

@@ -20,7 +20,7 @@
 	</div>
 	<button id="randomizeData">Randomize Data</button>
 	<script>
-	var color = Chart.helpers.color;
+	var color = Chart.helpers.canvas.color;
 	var scatterChartData = {
 		datasets: [{
 			label: 'My First dataset',

samples/legend/point-style.html

@@ -35,7 +35,7 @@
 		</div>
 	</div>
 	<script>
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		function createConfig(colorName) {
 			return {
 				type: 'line',

samples/legend/positioning.html

@@ -41,7 +41,7 @@
 		</div>
 	</div>
 	<script>
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		function createConfig(legendPosition, colorName) {
 			return {
 				type: 'line',

samples/scales/logarithmic/scatter.html

@@ -19,7 +19,7 @@
 		<canvas id="canvas"></canvas>
 	</div>
 	<script>
-	var color = Chart.helpers.color;
+	var color = Chart.helpers.canvas.color;
 	var scatterChartData = {
 		datasets: [{
 			borderColor: window.chartColors.red,
@@ -137,7 +137,7 @@
 						position: 'bottom',
 						ticks: {
 							userCallback: function(tick) {
-								var remain = tick / (Math.pow(10, Math.floor(Chart.helpers.log10(tick))));
+								var remain = tick / (Math.pow(10, Math.floor(Chart.helpers.math.log10(tick))));
 								if (remain === 1 || remain === 2 || remain === 5) {
 									return tick.toString() + 'Hz';
 								}

samples/scales/time/combo.html

@@ -33,7 +33,7 @@
 			return moment().add(days, 'd').format(timeFormat);
 		}
 
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var config = {
 			type: 'bar',
 			data: {

samples/scales/time/financial.html

@@ -57,7 +57,7 @@
 		ctx.canvas.width = 1000;
 		ctx.canvas.height = 300;
 
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var cfg = {
 			type: 'bar',
 			data: {

samples/scales/time/line-point-data.html

@@ -33,7 +33,7 @@
 			return moment().add(days, 'd').format();
 		}
 
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var config = {
 			type: 'line',
 			data: {

samples/scales/time/line.html

@@ -37,7 +37,7 @@
 			return moment().add(days, 'd').format(timeFormat);
 		}
 
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var config = {
 			type: 'line',
 			data: {

samples/tooltips/custom-points.html

@@ -69,7 +69,7 @@
 				});
 			}
 		};
-		var color = Chart.helpers.color;
+		var color = Chart.helpers.canvas.color;
 		var lineChartData = {
 			labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
 			datasets: [{

src/chart.js

@@ -5,9 +5,6 @@ var Chart = require('./core/core')();
 
 Chart.helpers = require('./helpers/index');
 
-// @todo dispatch these helpers into appropriated helpers/helpers.* file and write unit tests!
-require('./core/core.helpers')(Chart);
-
 Chart.Animation = require('./core/core.animation');
 Chart.animationService = require('./core/core.animations');
 Chart.controllers = require('./controllers/index');

src/controllers/controller.bubble.js

@@ -109,8 +109,8 @@ module.exports = DatasetController.extend({
 			radius: model.radius
 		};
 
-		model.backgroundColor = helpers.valueOrDefault(options.hoverBackgroundColor, helpers.getHoverColor(options.backgroundColor));
-		model.borderColor = helpers.valueOrDefault(options.hoverBorderColor, helpers.getHoverColor(options.borderColor));
+		model.backgroundColor = helpers.valueOrDefault(options.hoverBackgroundColor, helpers.canvas.getHoverColor(options.backgroundColor));
+		model.borderColor = helpers.valueOrDefault(options.hoverBorderColor, helpers.canvas.getHoverColor(options.borderColor));
 		model.borderWidth = helpers.valueOrDefault(options.hoverBorderWidth, options.borderWidth);
 		model.radius = options.radius + options.hoverRadius;
 	},

src/controllers/controller.line.js

@@ -264,15 +264,15 @@ module.exports = DatasetController.extend({
 		}
 
 		if (lineModel.cubicInterpolationMode === 'monotone') {
-			helpers.splineCurveMonotone(points);
+			helpers.math.splineCurveMonotone(points);
 		} else {
 			for (i = 0, ilen = points.length; i < ilen; ++i) {
 				point = points[i];
 				model = point._model;
-				controlPoints = helpers.splineCurve(
-					helpers.previousItem(points, i)._model,
+				controlPoints = helpers.math.splineCurve(
+					helpers.math.previousItem(points, i)._model,
 					model,
-					helpers.nextItem(points, i)._model,
+					helpers.math.nextItem(points, i)._model,
 					lineModel.tension
 				);
 				model.controlPointPreviousX = controlPoints.previous.x;
@@ -344,8 +344,8 @@ module.exports = DatasetController.extend({
 			radius: model.radius
 		};
 
-		model.backgroundColor = custom.hoverBackgroundColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-		model.borderColor = custom.hoverBorderColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
+		model.backgroundColor = custom.hoverBackgroundColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.canvas.getHoverColor(model.backgroundColor));
+		model.borderColor = custom.hoverBorderColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.canvas.getHoverColor(model.borderColor));
 		model.borderWidth = custom.hoverBorderWidth || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
 		model.radius = custom.hoverRadius || helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
 	}

src/controllers/controller.radar.js

@@ -135,10 +135,10 @@ module.exports = DatasetController.extend({
 
 		for (i = 0, ilen = points.length; i < ilen; i++) {
 			model = points[i]._model;
-			controlPoints = helpers.splineCurve(
-				helpers.previousItem(points, i, true)._model,
+			controlPoints = helpers.math.splineCurve(
+				helpers.math.previousItem(points, i, true)._model,
 				model,
-				helpers.nextItem(points, i, true)._model,
+				helpers.math.nextItem(points, i, true)._model,
 				model.tension
 			);
 
@@ -165,8 +165,8 @@ module.exports = DatasetController.extend({
 		};
 
 		model.radius = custom.hoverRadius ? custom.hoverRadius : helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
-		model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-		model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
+		model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.canvas.getHoverColor(model.backgroundColor));
+		model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.canvas.getHoverColor(model.borderColor));
 		model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
 	}
 });

src/core/core.animations.js

@@ -51,7 +51,7 @@ module.exports = {
 	},
 
 	cancelAnimation: function(chart) {
-		var index = helpers.findIndex(this.animations, function(animation) {
+		var index = helpers.utility.findIndex(this.animations, function(animation) {
 			return animation.chart === chart;
 		});
 
@@ -67,7 +67,7 @@ module.exports = {
 			// Skip animation frame requests until the active one is executed.
 			// This can happen when processing mouse events, e.g. 'mousemove'
 			// and 'mouseout' events will trigger multiple renders.
-			me.request = helpers.requestAnimFrame.call(window, function() {
+			me.request = helpers.canvas.requestAnimFrame.call(window, function() {
 				me.request = null;
 				me.startDigest();
 			});

src/core/core.controller.js

@@ -33,7 +33,7 @@ module.exports = function(Chart) {
 		data.datasets = data.datasets || [];
 		data.labels = data.labels || [];
 
-		config.options = helpers.configMerge(
+		config.options = helpers.utility.configMerge(
 			defaults.global,
 			defaults[config.type],
 			config.options || {});
@@ -52,7 +52,7 @@ module.exports = function(Chart) {
 			layouts.removeBox(chart, scale);
 		});
 
-		newOptions = helpers.configMerge(
+		newOptions = helpers.utility.configMerge(
 			Chart.defaults.global,
 			Chart.defaults[chart.config.type],
 			newOptions);
@@ -139,7 +139,7 @@ module.exports = function(Chart) {
 			// Before init plugin notification
 			plugins.notify(me, 'beforeInit');
 
-			helpers.retinaScale(me, me.options.devicePixelRatio);
+			helpers.dom.retinaScale(me, me.options.devicePixelRatio);
 
 			me.bindEvents();
 
@@ -180,8 +180,8 @@ module.exports = function(Chart) {
 			// the canvas display style uses the same integer values to avoid blurring effect.
 
 			// Set to 0 instead of canvas.size because the size defaults to 300x150 if the element is collapsed
-			var newWidth = Math.max(0, Math.floor(helpers.getMaximumWidth(canvas)));
-			var newHeight = Math.max(0, Math.floor(aspectRatio ? newWidth / aspectRatio : helpers.getMaximumHeight(canvas)));
+			var newWidth = Math.max(0, Math.floor(helpers.dom.getMaximumWidth(canvas)));
+			var newHeight = Math.max(0, Math.floor(aspectRatio ? newWidth / aspectRatio : helpers.dom.getMaximumHeight(canvas)));
 
 			if (me.width === newWidth && me.height === newHeight) {
 				return;
@@ -192,7 +192,7 @@ module.exports = function(Chart) {
 			canvas.style.width = newWidth + 'px';
 			canvas.style.height = newHeight + 'px';
 
-			helpers.retinaScale(me, options.devicePixelRatio);
+			helpers.dom.retinaScale(me, options.devicePixelRatio);
 
 			if (!silent) {
 				// Notify any plugins about the resize

src/core/core.datasetController.js

@@ -246,7 +246,7 @@ helpers.extend(DatasetController.prototype, {
 		var index = element._index;
 		var custom = element.custom || {};
 		var valueOrDefault = helpers.valueAtIndexOrDefault;
-		var getHoverColor = helpers.getHoverColor;
+		var getHoverColor = helpers.canvas.getHoverColor;
 		var model = element._model;
 
 		element.$previousStyle = {

src/core/core.element.js

@@ -106,7 +106,7 @@ helpers.extend(Element.prototype, {
 	},
 
 	hasValue: function() {
-		return helpers.isNumber(this._model.x) && helpers.isNumber(this._model.y);
+		return helpers.math.isNumber(this._model.x) && helpers.math.isNumber(this._model.y);
 	}
 });