Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimon Gygax2021-05-12 15:07:54 +0000
committerFritz Schinkel2021-05-17 11:13:35 +0000
commitf22cb89528941e56e2eb3617b1f1ff13e4c1e873 (patch)
tree3546393217c4f1abd5d2fecd2516c906aabf1965
parent56e549bc40271b1af3a2ab33af3181d717aef0ff (diff)
downloadorg.eclipse.scout.rt-f22cb89528941e56e2eb3617b1f1ff13e4c1e873.tar.gz
org.eclipse.scout.rt-f22cb89528941e56e2eb3617b1f1ff13e4c1e873.tar.xz
org.eclipse.scout.rt-f22cb89528941e56e2eb3617b1f1ff13e4c1e873.zip
ChartJsRenderer: Adjust handling of properties
- Update lineTension property when updating (only) data - Do not overwrite dataset colors, if a function is set Change-Id: I0ca4822f8ff2f45d83ae7c3aa6724da39fc24a6c Reviewed-on: https://git.eclipse.org/r/c/scout/org.eclipse.scout.rt/+/180536 Tested-by: Scout Bot <scout-bot@eclipse.org> Reviewed-by: Fritz Schinkel <fritz.schinkel@bsi-software.com>
-rw-r--r--eclipse-scout-chart/src/chart/ChartJsRenderer.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/eclipse-scout-chart/src/chart/ChartJsRenderer.js b/eclipse-scout-chart/src/chart/ChartJsRenderer.js
index a1c919395c..5d07355dd4 100644
--- a/eclipse-scout-chart/src/chart/ChartJsRenderer.js
+++ b/eclipse-scout-chart/src/chart/ChartJsRenderer.js
@@ -334,6 +334,7 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
transferProperty(sourceDataset, targetDataset, 'hoverBorderColor', true);
transferProperty(sourceDataset, targetDataset, 'legendColor', true);
transferProperty(sourceDataset, targetDataset, 'pointHoverBackgroundColor', true);
+ transferProperty(sourceDataset, targetDataset, 'lineTension', true);
}
let targetLength = targetData.datasets.length,
sourceLength = sourceData.datasets.length;
@@ -1163,6 +1164,9 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
pointHoverBackgroundColor = colors.pointHoverColor;
let setProperty = (identifier, value) => {
+ if (typeof elem[identifier] === 'function') {
+ return;
+ }
if (value && value.length) {
elem[identifier] = Array.isArray(value) ? [...value] : value;
}

Back to the top