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

Make Chart.Element/elements.* importable #4540

Merged
merged 1 commit into from
Jul 21, 2017
Merged

Make Chart.Element/elements.* importable #4540

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ Chart.helpers = require('./helpers/index');
require('./core/core.helpers')(Chart);

Chart.defaults = require('./core/core.defaults');
Chart.Element = require('./core/core.element');
Chart.elements = require('./elements/index');
Chart.Interaction = require('./core/core.interaction');
Chart.platform = require('./platforms/platform');
Chart.Ticks = require('./core/core.ticks');

require('./core/core.element')(Chart);
require('./core/core.plugin')(Chart);
require('./core/core.animation')(Chart);
require('./core/core.controller')(Chart);
Expand All @@ -23,11 +24,6 @@ require('./core/core.scaleService')(Chart);
require('./core/core.scale')(Chart);
require('./core/core.tooltip')(Chart);

require('./elements/element.arc')(Chart);
require('./elements/element.line')(Chart);
require('./elements/element.point')(Chart);
require('./elements/element.rectangle')(Chart);

require('./scales/scale.linearbase')(Chart);
require('./scales/scale.category')(Chart);
require('./scales/scale.linear')(Chart);
Expand Down
15 changes: 8 additions & 7 deletions src/controllers/controller.bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

defaults._set('bar', {
Expand Down Expand Up @@ -89,7 +90,7 @@ module.exports = function(Chart) {

Chart.controllers.bar = Chart.DatasetController.extend({

dataElementType: Chart.elements.Rectangle,
dataElementType: elements.Rectangle,

initialize: function() {
var me = this;
Expand All @@ -104,13 +105,13 @@ module.exports = function(Chart) {

update: function(reset) {
var me = this;
var elements = me.getMeta().data;
var rects = me.getMeta().data;
var i, ilen;

me._ruler = me.getRuler();

for (i = 0, ilen = elements.length; i < ilen; ++i) {
me.updateElement(elements[i], i, reset);
for (i = 0, ilen = rects.length; i < ilen; ++i) {
me.updateElement(rects[i], i, reset);
}
},

Expand Down Expand Up @@ -326,9 +327,9 @@ module.exports = function(Chart) {
draw: function() {
var me = this;
var chart = me.chart;
var elements = me.getMeta().data;
var rects = me.getMeta().data;
var dataset = me.getDataset();
var ilen = elements.length;
var ilen = rects.length;
var i = 0;
var d;

Expand All @@ -337,7 +338,7 @@ module.exports = function(Chart) {
for (; i<ilen; ++i) {
d = dataset.data[i];
if (d !== null && d !== undefined && !isNaN(d)) {
elements[i].draw();
rects[i].draw();
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/controllers/controller.bubble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

defaults._set('bubble', {
Expand Down Expand Up @@ -41,7 +42,7 @@ module.exports = function(Chart) {

Chart.controllers.bubble = Chart.DatasetController.extend({

dataElementType: Chart.elements.Point,
dataElementType: elements.Point,

update: function(reset) {
var me = this;
Expand Down
11 changes: 6 additions & 5 deletions src/controllers/controller.doughnut.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

defaults._set('doughnut', {
Expand Down Expand Up @@ -126,7 +127,7 @@ module.exports = function(Chart) {

Chart.controllers.doughnut = Chart.controllers.pie = Chart.DatasetController.extend({

dataElementType: Chart.elements.Arc,
dataElementType: elements.Arc,

linkScales: helpers.noop,

Expand Down Expand Up @@ -281,16 +282,16 @@ module.exports = function(Chart) {
},

// gets the max border or hover width to properly scale pie charts
getMaxBorderWidth: function(elements) {
getMaxBorderWidth: function(arcs) {
var max = 0,
index = this.index,
length = elements.length,
length = arcs.length,
borderWidth,
hoverWidth;

for (var i = 0; i < length; i++) {
borderWidth = elements[i]._model ? elements[i]._model.borderWidth : 0;
hoverWidth = elements[i]._chart ? elements[i]._chart.config.data.datasets[index].hoverBorderWidth : 0;
borderWidth = arcs[i]._model ? arcs[i]._model.borderWidth : 0;
hoverWidth = arcs[i]._chart ? arcs[i]._chart.config.data.datasets[index].hoverBorderWidth : 0;

max = borderWidth > max ? borderWidth : max;
max = hoverWidth > max ? hoverWidth : max;
Expand Down
5 changes: 3 additions & 2 deletions src/controllers/controller.line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

defaults._set('line', {
Expand Down Expand Up @@ -31,9 +32,9 @@ module.exports = function(Chart) {

Chart.controllers.line = Chart.DatasetController.extend({

datasetElementType: Chart.elements.Line,
datasetElementType: elements.Line,

dataElementType: Chart.elements.Point,
dataElementType: elements.Point,

update: function(reset) {
var me = this;
Expand Down
3 changes: 2 additions & 1 deletion src/controllers/controller.polarArea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

defaults._set('polarArea', {
Expand Down Expand Up @@ -111,7 +112,7 @@ module.exports = function(Chart) {

Chart.controllers.polarArea = Chart.DatasetController.extend({

dataElementType: Chart.elements.Arc,
dataElementType: elements.Arc,

linkScales: helpers.noop,

Expand Down
5 changes: 3 additions & 2 deletions src/controllers/controller.radar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

defaults._set('radar', {
Expand All @@ -18,9 +19,9 @@ module.exports = function(Chart) {

Chart.controllers.radar = Chart.DatasetController.extend({

datasetElementType: Chart.elements.Line,
datasetElementType: elements.Line,

dataElementType: Chart.elements.Point,
dataElementType: elements.Point,

linkScales: helpers.noop,

Expand Down
3 changes: 2 additions & 1 deletion src/core/core.animation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
'use strict';

var defaults = require('./core.defaults');
var Element = require('./core.element');
var helpers = require('../helpers/index');

defaults._set('global', {
Expand All @@ -15,7 +16,7 @@ defaults._set('global', {

module.exports = function(Chart) {

Chart.Animation = Chart.Element.extend({
Chart.Animation = Element.extend({
chart: null, // the animation associated chart instance
currentStep: 0, // the current animation step
numSteps: 60, // default number of steps
Expand Down
Loading