Skip to content

Commit b5eb159

Browse files
committed
Refactor update element
1 parent b3e1451 commit b5eb159

File tree

2 files changed

+30
-48
lines changed

2 files changed

+30
-48
lines changed

docs/Chart.Financial.js

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,22 @@ module.exports = function(Chart) {
2222
Chart.controllers.candlestick = Chart.controllers.financial.extend({
2323
dataElementType: Chart.elements.Candlestick,
2424

25-
updateElement: function(element, index, reset) {
26-
var me = this;
27-
var meta = me.getMeta();
28-
var dataset = me.getDataset();
29-
30-
element._xScale = me.getScaleForId(meta.xAxisID);
31-
element._yScale = me.getScaleForId(meta.yAxisID);
32-
element._datasetIndex = me.index;
33-
element._index = index;
34-
35-
element._model = {
36-
datasetLabel: dataset.label || '',
37-
//label: '', // to get label value please use dataset.data[index].label
38-
39-
// Appearance
40-
color: dataset.color,
41-
borderColor: dataset.borderColor,
42-
borderWidth: dataset.borderWidth,
43-
};
44-
45-
me.updateElementGeometry(element, index, reset);
46-
47-
element.pivot();
25+
/*/
26+
getElementOptions: function() {
27+
return this.chart.options.elements.candlestick;
4828
},
49-
29+
/*/
30+
31+
updateRectangle: function(rectangle, options) {
32+
Chart.controllers.financial.prototype.updateRectangle.apply(
33+
this,
34+
[
35+
rectangle,
36+
options ? options : this.chart.options.elements.candlestick
37+
]
38+
);
39+
}
40+
/**/
5041
});
5142

5243
};

src/controller.candlestick.js

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,22 @@ module.exports = function(Chart) {
1111
Chart.controllers.candlestick = Chart.controllers.financial.extend({
1212
dataElementType: Chart.elements.Candlestick,
1313

14-
updateElement: function(element, index, reset) {
15-
var me = this;
16-
var meta = me.getMeta();
17-
var dataset = me.getDataset();
18-
19-
element._xScale = me.getScaleForId(meta.xAxisID);
20-
element._yScale = me.getScaleForId(meta.yAxisID);
21-
element._datasetIndex = me.index;
22-
element._index = index;
23-
24-
element._model = {
25-
datasetLabel: dataset.label || '',
26-
//label: '', // to get label value please use dataset.data[index].label
27-
28-
// Appearance
29-
color: dataset.color,
30-
borderColor: dataset.borderColor,
31-
borderWidth: dataset.borderWidth,
32-
};
33-
34-
me.updateElementGeometry(element, index, reset);
35-
36-
element.pivot();
14+
/*/
15+
getElementOptions: function() {
16+
return this.chart.options.elements.candlestick;
3717
},
38-
18+
/*/
19+
20+
updateRectangle: function(rectangle, options) {
21+
Chart.controllers.financial.prototype.updateRectangle.apply(
22+
this,
23+
[
24+
rectangle,
25+
options ? options : this.chart.options.elements.candlestick
26+
]
27+
);
28+
}
29+
/**/
3930
});
4031

4132
};

0 commit comments

Comments
 (0)