summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-08-24 07:02:52 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-08-24 07:02:52 +0900
commit92cf205c6669abde283ae13491cd1a07da32a98a (patch)
tree691fc770c86e2b0eadbcbb16d96cd793ce0fd07a /src
parentRefactor (diff)
downloadsharkey-92cf205c6669abde283ae13491cd1a07da32a98a.tar.gz
sharkey-92cf205c6669abde283ae13491cd1a07da32a98a.tar.bz2
sharkey-92cf205c6669abde283ae13491cd1a07da32a98a.zip
Fix bug
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/pages/admin/admin.chart.chart.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
index d79b0ba192..c09dc6dd8c 100644
--- a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
+++ b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
@@ -1,5 +1,6 @@
import Vue from 'vue';
import { Line } from 'vue-chartjs';
+import * as mergeOptions from 'merge-options';
export default Vue.extend({
extends: Line,
@@ -21,7 +22,7 @@ export default Vue.extend({
},
methods: {
render() {
- this.renderChart(this.data, Object.assign({
+ this.renderChart(this.data, mergeOptions({
responsive: false,
scales: {
xAxes: [{