From 96740b82ed3a84d8066cc6bc3f222474601d5eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 6 Sep 2017 13:52:02 +0200 Subject: [PATCH] Move getAggregation function to a class method --- lib/cartodb/models/dataview/histogram.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js index 5a4f713b..dbe8f014 100644 --- a/lib/cartodb/models/dataview/histogram.js +++ b/lib/cartodb/models/dataview/histogram.js @@ -606,7 +606,7 @@ module.exports = class Histogram extends BaseWidget { binsStart = populateBinStart(override, firstRow); if (Number.isFinite(timestampStart)) { - aggregation = getAggregation(override, this.aggregation); + aggregation = this.getAggregation(override); offset = getOffset(override, this.offset); } @@ -650,6 +650,10 @@ module.exports = class Histogram extends BaseWidget { _query: this.query }); } + + getAggregation (override) { + return override && override.aggregation ? override.aggregation : this.aggregation; + } }; var DATE_AGGREGATIONS = { @@ -663,9 +667,6 @@ var DATE_AGGREGATIONS = { 'year': true }; -function getAggregation(override, aggregation) { - return override && override.aggregation ? override.aggregation : aggregation; -} function getOffset(override, offset) { if (override && override.offset) {