Skip to content

Commit f093c36

Browse files
benmccannsimonbrunel
authored andcommitted
Cache getScaleForId() calls in the line controller (#6250)
1 parent d6a5ea0 commit f093c36

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/controllers/controller.line.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ module.exports = DatasetController.extend({
4141
var line = meta.dataset;
4242
var points = meta.data || [];
4343
var options = me.chart.options;
44-
var scale = me.getScaleForId(meta.yAxisID);
4544
var dataset = me.getDataset();
4645
var showLine = me._showLine = valueOrDefault(me._config.showLine, options.showLines);
4746
var i, ilen;
4847

48+
me._xScale = me.getScaleForId(meta.xAxisID);
49+
me._yScale = me.getScaleForId(meta.yAxisID);
50+
4951
// Update Line
5052
if (showLine) {
5153
// Compatibility: If the properties are defined with only the old name, use those values
@@ -54,7 +56,7 @@ module.exports = DatasetController.extend({
5456
}
5557

5658
// Utility
57-
line._scale = scale;
59+
line._scale = me._yScale;
5860
line._datasetIndex = me.index;
5961
// Data
6062
line._children = points;
@@ -86,8 +88,8 @@ module.exports = DatasetController.extend({
8688
var dataset = me.getDataset();
8789
var datasetIndex = me.index;
8890
var value = dataset.data[index];
89-
var yScale = me.getScaleForId(meta.yAxisID);
90-
var xScale = me.getScaleForId(meta.xAxisID);
91+
var xScale = me._xScale;
92+
var yScale = me._yScale;
9193
var lineModel = meta.dataset._model;
9294
var x, y;
9395

@@ -227,8 +229,7 @@ module.exports = DatasetController.extend({
227229
calculatePointY: function(value, index, datasetIndex) {
228230
var me = this;
229231
var chart = me.chart;
230-
var meta = me.getMeta();
231-
var yScale = me.getScaleForId(meta.yAxisID);
232+
var yScale = me._yScale;
232233
var sumPos = 0;
233234
var sumNeg = 0;
234235
var i, ds, dsMeta;

0 commit comments

Comments
 (0)