Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 1 addition & 8 deletions src/core/core.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -737,14 +737,7 @@ class Chart {
}

getContext() {
return this.$context || (this.$context = Object.create(null, {
chart: {
value: this
},
type: {
value: 'chart'
}
}));
return this.$context || (this.$context = {chart: this, type: 'chart'});
}

getVisibleDatasetCount() {
Expand Down
61 changes: 17 additions & 44 deletions src/core/core.datasetController.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,54 +149,27 @@ function getFirstScaleId(chart, axis) {
}

function createDatasetContext(parent, index, dataset) {
return Object.create(parent, {
active: {
writable: true,
value: false
},
dataset: {
value: dataset
},
datasetIndex: {
value: index
},
index: {
get() {
return this.datasetIndex;
}
},
type: {
value: 'dataset'
return Object.assign(Object.create(parent),
{
active: false,
dataset,
datasetIndex: index,
index,
type: 'dataset'
}
});
);
}

function createDataContext(parent, index, point, raw, element) {
return Object.create(parent, {
active: {
writable: true,
value: false
},
dataIndex: {
value: index
},
parsed: {
value: point
},
raw: {
value: raw
},
element: {
value: element
},
index: {
get() {
return this.dataIndex;
}
},
type: {
value: 'data',
}
return Object.assign(Object.create(parent), {
active: false,
dataIndex: index,
parsed: point,
raw,
element,
index,
mode: 'default',
type: 'data'
});
}

Expand Down
24 changes: 7 additions & 17 deletions src/core/core.scale.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,27 +282,17 @@ function skip(ticks, newTicks, spacing, majorStart, majorEnd) {
}

function createScaleContext(parent, scale) {
return Object.create(parent, {
scale: {
value: scale
},
type: {
value: 'scale'
}
return Object.assign(Object.create(parent), {
scale,
type: 'scale'
});
}

function createTickContext(parent, index, tick) {
return Object.create(parent, {
tick: {
value: tick
},
index: {
value: index
},
type: {
value: 'tick'
}
return Object.assign(Object.create(parent), {
tick,
index,
type: 'tick'
});
}

Expand Down