Make helper method aliases global

src/controllers/controller.bar.js

@@ -5,6 +5,8 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');
 
+var resolve = helpers.options.resolve;
+
 defaults._set('bar', {
 	hover: {
 		mode: 'label'
@@ -410,7 +412,6 @@ module.exports = DatasetController.extend({
 		var dataset = datasets[me.index];
 		var custom = rectangle.custom || {};
 		var options = chart.options.elements.rectangle;
-		var resolve = helpers.options.resolve;
 		var values = {};
 		var i, ilen, key;
 

src/controllers/controller.bubble.js

@@ -5,6 +5,9 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');
 
+var valueOrDefault = helpers.valueOrDefault;
+var resolve = helpers.options.resolve;
+
 defaults._set('bubble', {
 	hover: {
 		mode: 'single'
@@ -101,7 +104,6 @@ module.exports = DatasetController.extend({
 	setHoverStyle: function(point) {
 		var model = point._model;
 		var options = point._options;
-		var valueOrDefault = helpers.valueOrDefault;
 		var getHoverColor = helpers.getHoverColor;
 
 		point.$previousStyle = {
@@ -127,7 +129,6 @@ module.exports = DatasetController.extend({
 		var dataset = datasets[me.index];
 		var custom = point.custom || {};
 		var options = chart.options.elements.point;
-		var resolve = helpers.options.resolve;
 		var data = dataset.data[index];
 		var values = {};
 		var i, ilen, key;

src/controllers/controller.line.js

@@ -7,6 +7,7 @@ var helpers = require('../helpers/index');
 
 var valueOrDefault = helpers.valueOrDefault;
 var resolve = helpers.options.resolve;
+var isPointInArea = helpers.canvas._isPointInArea;
 
 defaults._set('line', {
 	showLines: true,
@@ -236,7 +237,6 @@ module.exports = DatasetController.extend({
 		var lineModel = meta.dataset._model;
 		var area = chart.chartArea;
 		var points = meta.data || [];
-		var isPointInArea = helpers.canvas._isPointInArea;
 		var i, ilen, point, model, controlPoints;
 
 		// Only consider points that are drawn in case the spanGaps option is used

src/controllers/controller.polarArea.js

@@ -245,7 +245,7 @@ module.exports = DatasetController.extend({
 			datasetIndex: me.index
 		};
 
-		return helpers.options.resolve([
+		return resolve([
 			me.chart.options.elements.arc.angle,
 			(2 * Math.PI) / count
 		], context, index);

src/core/core.controller.js

@@ -12,6 +12,8 @@ var plugins = require('./core.plugins');
 var scaleService = require('../core/core.scaleService');
 var Tooltip = require('./core.tooltip');
 
+var valueOrDefault = helpers.valueOrDefault;
+
 module.exports = function(Chart) {
 
 	// Create a dictionary of chart types, to allow for extension of existing types
@@ -265,7 +267,7 @@ module.exports = function(Chart) {
 			helpers.each(items, function(item) {
 				var scaleOptions = item.options;
 				var id = scaleOptions.id;
-				var scaleType = helpers.valueOrDefault(scaleOptions.type, item.dtype);
+				var scaleType = valueOrDefault(scaleOptions.type, item.dtype);
 
 				if (positionIsHorizontal(scaleOptions.position) !== positionIsHorizontal(item.dposition)) {
 					scaleOptions.position = item.dposition;
@@ -510,7 +512,7 @@ module.exports = function(Chart) {
 			}
 
 			var animationOptions = me.options.animation;
-			var duration = helpers.valueOrDefault(config.duration, animationOptions && animationOptions.duration);
+			var duration = valueOrDefault(config.duration, animationOptions && animationOptions.duration);
 			var lazy = config.lazy;
 
 			if (plugins.notify(me, 'beforeRender') === false) {

src/core/core.scale.js

@@ -5,6 +5,9 @@ var Element = require('./core.element');
 var helpers = require('../helpers/index');
 var Ticks = require('./core.ticks');
 
+var valueOrDefault = helpers.valueOrDefault;
+var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
+
 defaults._set('scale', {
 	display: true,
 	position: 'left',
@@ -728,8 +731,6 @@ module.exports = Element.extend({
 		var isMirrored = optionTicks.mirror;
 		var isHorizontal = me.isHorizontal();
 
-		var valueOrDefault = helpers.valueOrDefault;
-		var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
 		var parseFont = helpers.options._parseFont;
 		var ticks = optionTicks.autoSkip ? me._autoSkip(me.getTicks()) : me.getTicks();
 		var tickFontColor = valueOrDefault(optionTicks.fontColor, defaultFontColor);

src/core/core.tooltip.js

@@ -4,6 +4,8 @@ var defaults = require('./core.defaults');
 var Element = require('./core.element');
 var helpers = require('../helpers/index');
 
+var valueOrDefault = helpers.valueOrDefault;
+
 defaults._set('global', {
 	tooltips: {
 		enabled: true,
@@ -221,7 +223,6 @@ function createTooltipItem(element) {
  */
 function getBaseModel(tooltipOpts) {
 	var globalDefaults = defaults.global;
-	var valueOrDefault = helpers.valueOrDefault;
 
 	return {
 		// Positioning

src/elements/element.line.js

@@ -4,6 +4,8 @@ var defaults = require('../core/core.defaults');
 var Element = require('../core/core.element');
 var helpers = require('../helpers/index');
 
+var valueOrDefault = helpers.valueOrDefault;
+
 var defaultColor = defaults.global.defaultColor;
 
 defaults._set('global', {
@@ -30,7 +32,6 @@ module.exports = Element.extend({
 		var ctx = me._chart.ctx;
 		var spanGaps = vm.spanGaps;
 		var points = me._children.slice(); // clone array
-		var valueOrDefault = helpers.valueOrDefault;
 		var globalDefaults = defaults.global;
 		var globalOptionLineElements = globalDefaults.elements.line;
 		var lastDrawnIndex = -1;

src/elements/element.point.js

@@ -4,6 +4,8 @@ var defaults = require('../core/core.defaults');
 var Element = require('../core/core.element');
 var helpers = require('../helpers/index');
 
+var valueOrDefault = helpers.valueOrDefault;
+
 var defaultColor = defaults.global.defaultColor;
 
 defaults._set('global', {
@@ -81,7 +83,7 @@ module.exports = Element.extend({
 		// Clipping for Points.
 		if (chartArea === undefined || helpers.canvas._isPointInArea(vm, chartArea)) {
 			ctx.strokeStyle = vm.borderColor || defaultColor;
-			ctx.lineWidth = helpers.valueOrDefault(vm.borderWidth, globalDefaults.elements.point.borderWidth);
+			ctx.lineWidth = valueOrDefault(vm.borderWidth, globalDefaults.elements.point.borderWidth);
 			ctx.fillStyle = vm.backgroundColor || defaultColor;
 			helpers.canvas.drawPoint(ctx, pointStyle, radius, x, y, rotation);
 		}

src/helpers/helpers.options.js

@@ -3,6 +3,8 @@
 var defaults = require('../core/core.defaults');
 var helpers = require('./helpers.core');
 
+var valueOrDefault = helpers.valueOrDefault;
+
 /**
  * Converts the given font object into a CSS font string.
  * @param {Object} font - A font object.
@@ -91,7 +93,6 @@ module.exports = {
 	 * @private
 	 */
 	_parseFont: function(options) {
-		var valueOrDefault = helpers.valueOrDefault;
 		var globalDefaults = defaults.global;
 		var size = valueOrDefault(options.fontSize, globalDefaults.defaultFontSize);
 		var font = {

src/plugins/plugin.legend.js

@@ -6,6 +6,7 @@ var helpers = require('../helpers/index');
 var layouts = require('../core/core.layouts');
 
 var noop = helpers.noop;
+var valueOrDefault = helpers.valueOrDefault;
 
 defaults._set('global', {
 	legend: {
@@ -327,7 +328,6 @@ var Legend = Element.extend({
 
 		if (opts.display) {
 			var ctx = me.ctx;
-			var valueOrDefault = helpers.valueOrDefault;
 			var fontColor = valueOrDefault(labelOpts.fontColor, globalDefaults.defaultFontColor);
 			var labelFont = helpers.options._parseFont(labelOpts);
 			var fontSize = labelFont.size;

src/plugins/plugin.title.js

@@ -141,7 +141,6 @@ var Title = Element.extend({
 	draw: function() {
 		var me = this;
 		var ctx = me.ctx;
-		var valueOrDefault = helpers.valueOrDefault;
 		var opts = me.options;
 
 		if (opts.display) {
@@ -155,7 +154,7 @@ var Title = Element.extend({
 			var right = me.right;
 			var maxWidth, titleX, titleY;
 
-			ctx.fillStyle = valueOrDefault(opts.fontColor, defaults.global.defaultFontColor); // render in correct colour
+			ctx.fillStyle = helpers.valueOrDefault(opts.fontColor, defaults.global.defaultFontColor); // render in correct colour
 			ctx.font = fontOpts.string;
 
 			// Horizontal

src/scales/scale.radialLinear.js

@@ -7,6 +7,7 @@ var Ticks = require('../core/core.ticks');
 
 var valueOrDefault = helpers.valueOrDefault;
 var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
+var resolve = helpers.options.resolve;
 
 var defaultConfig = {
 	display: true,
@@ -226,7 +227,6 @@ function drawPointLabels(scale) {
 	var angleLineOpts = opts.angleLines;
 	var gridLineOpts = opts.gridLines;
 	var pointLabelOpts = opts.pointLabels;
-	var resolve = helpers.options.resolve;
 	var lineWidth = valueOrDefault(angleLineOpts.lineWidth, gridLineOpts.lineWidth);
 	var lineColor = valueOrDefault(angleLineOpts.color, gridLineOpts.color);
 	var tickBackdropHeight = getTickBackdropHeight(opts);