Skip to content

Handle a frozen dataset.data array. #6060

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

Merged
merged 6 commits into from
Feb 11, 2019
Merged

Handle a frozen dataset.data array. #6060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f297ad
Handle a frozen `dataset.data` array.
etimberg Feb 10, 2019
47c56fc
Remove the documentation change
etimberg Feb 10, 2019
e9bd480
Update the test to include destroying the chart
etimberg Feb 10, 2019
cadd326
Handle sealed objects & test more cases
etimberg Feb 10, 2019
14c18ef
Update tests and fix lint issues
etimberg Feb 11, 2019
dd980a8
Check that the test setup is correct
etimberg Feb 11, 2019
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
4 changes: 3 additions & 1 deletion src/core/core.datasetController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@ helpers.extend(DatasetController.prototype, {
unlistenArrayEvents(me._data, me);
}

listenArrayEvents(data, me);
if (data && Object.isExtensible(data)) {
listenArrayEvents(data, me);
}
me._data = data;
}

Expand Down
80 changes: 80 additions & 0 deletions test/specs/core.datasetController.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,86 @@ describe('Chart.DatasetController', function() {
});
});

describe('inextensible data', function() {
it('should handle a frozen data object', function() {
function createChart() {
var data = Object.freeze([0, 1, 2, 3, 4, 5]);
expect(Object.isExtensible(data)).toBeFalsy();

var chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: data
}]
}
});

var dataset = chart.data.datasets[0];
dataset.data = Object.freeze([5, 4, 3, 2, 1, 0]);
expect(Object.isExtensible(dataset.data)).toBeFalsy();
chart.update();

// Tests that the unlisten path also works for frozen objects
chart.destroy();
}

expect(createChart).not.toThrow();
});

it('should handle a sealed data object', function() {
function createChart() {
var data = Object.seal([0, 1, 2, 3, 4, 5]);
expect(Object.isExtensible(data)).toBeFalsy();

var chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: data
}]
}
});

var dataset = chart.data.datasets[0];
dataset.data = Object.seal([5, 4, 3, 2, 1, 0]);
expect(Object.isExtensible(dataset.data)).toBeFalsy();
chart.update();

// Tests that the unlisten path also works for frozen objects
chart.destroy();
}

expect(createChart).not.toThrow();
});

it('should handle an unextendable data object', function() {
function createChart() {
var data = Object.preventExtensions([0, 1, 2, 3, 4, 5]);
expect(Object.isExtensible(data)).toBeFalsy();

var chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: data
}]
}
});

var dataset = chart.data.datasets[0];
dataset.data = Object.preventExtensions([5, 4, 3, 2, 1, 0]);
expect(Object.isExtensible(dataset.data)).toBeFalsy();
chart.update();

// Tests that the unlisten path also works for frozen objects
chart.destroy();
}

expect(createChart).not.toThrow();
});
});

it('should synchronize metadata when data are inserted or removed', function() {
var data = [0, 1, 2, 3, 4, 5];
var chart = acquireChart({
Expand Down