Skip to content

Commit f94b320

Browse files
committed
✨ Change reactiveDataMixin
1 parent 4ec6fa4 commit f94b320

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ coverage:
2525
ignore:
2626
- "tests/*"
2727
- "src/examples/*"
28+
- "src/mixins/*"
2829

2930

3031
comment:

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,11 @@
5656
"http-proxy-middleware": "^0.17.2",
5757
"inject-loader": "^2.0.1",
5858
"isparta-loader": "^2.0.0",
59+
"jasmine-core": "^2.5.2",
5960
"json-loader": "^0.5.4",
6061
"karma": "^1.3.0",
6162
"karma-coverage": "^1.1.1",
63+
"karma-jasmine": "^1.0.2",
6264
"karma-mocha": "^1.2.0",
6365
"karma-phantomjs-launcher": "^1.0.0",
6466
"karma-sinon-chai": "^1.2.0",

src/mixins/reactiveData.js

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,26 @@ module.exports = {
1919
})
2020

2121
if (JSON.stringify(newDataLabels) === JSON.stringify(oldDataLabels)) {
22-
newData.datasets.forEach((dataset, i) => {
23-
chart.data.datasets[i].data = dataset.data
24-
})
25-
chart.data.labels = newData.labels
26-
chart.update()
22+
this.forceUpdate(newData, chart)
2723
} else {
28-
this.renderChart(this.chartData, this.options)
24+
this.forceRender()
2925
}
3026
}
3127
}
3228
}
29+
},
30+
methods: {
31+
forceUpdate (newData, chart) {
32+
newData.datasets.forEach((dataset, i) => {
33+
chart.data.datasets[i].data = dataset.data
34+
})
35+
36+
chart.data.labels = newData.labels
37+
chart.update()
38+
},
39+
40+
forceRender () {
41+
this.renderChart(this.chartData, this.options)
42+
}
3343
}
3444
}

test/unit/.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
},
55
"globals": {
66
"expect": true,
7+
"jasmine": true,
78
"sinon": true
89
}
910
}

test/unit/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = function (config) {
5454
// http://karma-runner.github.io/0.13/config/browsers.html
5555
// 2. add it to the `browsers` array below.
5656
browsers: ['PhantomJS'],
57-
frameworks: ['mocha', 'sinon-chai'],
57+
frameworks: ['mocha', 'sinon-chai', 'jasmine'],
5858
reporters: ['spec', 'coverage'],
5959
files: ['./index.js'],
6060
preprocessors: {

0 commit comments

Comments
 (0)