Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Chart.Scale/scaleService importable #5383

Merged
merged 1 commit into from Apr 2, 2018
Merged

Make Chart.Scale/scaleService importable #5383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/chart.js
View file
Open in desktop
Expand Up @@ -17,13 +17,13 @@ Chart.Interaction = require('./core/core.interaction');
Chart.layouts = require('./core/core.layouts');
Chart.platform = require('./platforms/platform');
Chart.plugins = require('./core/core.plugins');
Chart.Scale = require('./core/core.scale');
Chart.scaleService = require('./core/core.scaleService');
Chart.Ticks = require('./core/core.ticks');
Chart.Tooltip = require('./core/core.tooltip');

require('./core/core.controller')(Chart);
require('./core/core.datasetController')(Chart);
require('./core/core.scaleService')(Chart);
require('./core/core.scale')(Chart);

require('./scales/scale.linearbase')(Chart);
require('./scales/scale.category')(Chart);
Expand All @@ -50,7 +50,7 @@ require('./charts/Chart.PolarArea')(Chart);
require('./charts/Chart.Radar')(Chart);
require('./charts/Chart.Scatter')(Chart);

// Loading built-it plugins
// Loading built-in plugins
var plugins = require('./plugins');
for (var k in plugins) {
if (plugins.hasOwnProperty(k)) {
Expand Down
5 changes: 3 additions & 2 deletions src/core/core.controller.js
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ var Interaction = require('./core.interaction');
var layouts = require('./core.layouts');
var platform = require('../platforms/platform');
var plugins = require('./core.plugins');
var scaleService = require('../core/core.scaleService');
var Tooltip = require('./core.tooltip');

module.exports = function(Chart) {
Expand Down Expand Up @@ -278,7 +279,7 @@ module.exports = function(Chart) {
scale.ctx = me.ctx;
scale.chart = me;
} else {
var scaleClass = Chart.scaleService.getScaleConstructor(scaleType);
var scaleClass = scaleService.getScaleConstructor(scaleType);
if (!scaleClass) {
return;
}
Expand Down Expand Up @@ -310,7 +311,7 @@ module.exports = function(Chart) {

me.scales = scales;

Chart.scaleService.addScalesToLayout(this);
scaleService.addScalesToLayout(this);
},

buildOrUpdateControllers: function() {
Expand Down
7 changes: 4 additions & 3 deletions src/core/core.helpers.js
View file
Open in desktop
Expand Up @@ -5,8 +5,9 @@
var color = require('chartjs-color');
var defaults = require('./core.defaults');
var helpers = require('../helpers/index');
var scaleService = require('../core/core.scaleService');

module.exports = function(Chart) {
module.exports = function() {

// -- Basic js utility methods

Expand All @@ -21,7 +22,7 @@ module.exports = function(Chart) {
target[key] = helpers.scaleMerge(tval, sval);
} else if (key === 'scale') {
// used in polar area & radar charts since there is only one scale
target[key] = helpers.merge(tval, [Chart.scaleService.getScaleDefaults(sval.type), sval]);
target[key] = helpers.merge(tval, [scaleService.getScaleDefaults(sval.type), sval]);
} else {
helpers._merger(key, target, source, options);
}
Expand Down Expand Up @@ -51,7 +52,7 @@ module.exports = function(Chart) {
if (!target[key][i].type || (scale.type && scale.type !== target[key][i].type)) {
// new/untyped scale or type changed: let's apply the new defaults
// then merge source scale to correctly overwrite the defaults.
helpers.merge(target[key][i], [Chart.scaleService.getScaleDefaults(type), scale]);
helpers.merge(target[key][i], [scaleService.getScaleDefaults(type), scale]);
} else {
// scales type are the same
helpers.merge(target[key][i], scale);
Expand Down