Skip to content

Commit

Permalink
Make helpers.getHoverColor alias local
Browse files Browse the repository at this point in the history
  • Loading branch information
nagix committed Jan 8, 2019
1 parent 897d97c commit 5b256c8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/controllers/controller.bubble.js
Expand Up @@ -5,7 +5,6 @@ var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

var getHoverColor = helpers.getHoverColor;
var valueOrDefault = helpers.valueOrDefault;
var resolve = helpers.options.resolve;

Expand Down Expand Up @@ -105,6 +104,7 @@ module.exports = DatasetController.extend({
setHoverStyle: function(point) {
var model = point._model;
var options = point._options;
var getHoverColor = helpers.getHoverColor;

point.$previousStyle = {
backgroundColor: model.backgroundColor,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/controller.line.js
Expand Up @@ -5,7 +5,6 @@ var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

var getHoverColor = helpers.getHoverColor;
var valueOrDefault = helpers.valueOrDefault;
var resolve = helpers.options.resolve;
var isPointInArea = helpers.canvas._isPointInArea;
Expand Down Expand Up @@ -324,6 +323,7 @@ module.exports = DatasetController.extend({
var index = element._index;
var custom = element.custom || {};
var model = element._model;
var getHoverColor = helpers.getHoverColor;

element.$previousStyle = {
backgroundColor: model.backgroundColor,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/controller.radar.js
Expand Up @@ -5,7 +5,6 @@ var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

var getHoverColor = helpers.getHoverColor;
var resolve = helpers.options.resolve;

defaults._set('radar', {
Expand Down Expand Up @@ -159,6 +158,7 @@ module.exports = DatasetController.extend({
var custom = point.custom || {};
var index = point._index;
var model = point._model;
var getHoverColor = helpers.getHoverColor;

point.$previousStyle = {
backgroundColor: model.backgroundColor,
Expand Down
2 changes: 1 addition & 1 deletion src/core/core.datasetController.js
Expand Up @@ -2,7 +2,6 @@

var helpers = require('../helpers/index');

var getHoverColor = helpers.getHoverColor;
var resolve = helpers.options.resolve;

var arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
Expand Down Expand Up @@ -249,6 +248,7 @@ helpers.extend(DatasetController.prototype, {
var index = element._index;
var custom = element.custom || {};
var model = element._model;
var getHoverColor = helpers.getHoverColor;

element.$previousStyle = {
backgroundColor: model.backgroundColor,
Expand Down
4 changes: 2 additions & 2 deletions src/helpers/helpers.options.js
Expand Up @@ -8,7 +8,7 @@ var valueOrDefault = helpers.valueOrDefault;
/**
* Converts the given font object into a CSS font string.
* @param {Object} font - A font object.
* @return {Stringg} The CSS font string. See https://developer.mozilla.org/en-US/docs/Web/CSS/font
* @return {String} The CSS font string. See https://developer.mozilla.org/en-US/docs/Web/CSS/font
* @private
*/
function toFontString(font) {
Expand Down Expand Up @@ -87,7 +87,7 @@ module.exports = {

/**
* Parses font options and returns the font object.
* @param {Object} options - A object that contains font opttons to be parsed.
* @param {Object} options - A object that contains font options to be parsed.
* @return {Object} The font object.
* @todo Support font.* options and renamed to toFont().
* @private
Expand Down

0 comments on commit 5b256c8

Please sign in to comment.