From 87e5fb10874b813ec42f43350fd28d99f8f1aded Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Mon, 11 Jul 2022 12:13:22 +0200 Subject: Preserve date range when switching between periods in evolution graphs (#19395) --- plugins/CoreHome/javascripts/dataTable.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'plugins/CoreHome/javascripts') diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 6007af40ec..253a942fc4 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -729,7 +729,13 @@ $.extend(DataTable.prototype, UIControl.prototype, { } var piwikPeriods = piwikHelper.getAngularDependency('piwikPeriods'); - var currentPeriod = piwikPeriods.parse(self.param['period'], self.param['date']); + if (self.param['dateUsedInGraph']) { + // this parameter is passed along when switching between periods. So we perfer using + // it, to avoid a change in the end date shown in the graph + var currentPeriod = piwikPeriods.parse('range', self.param['dateUsedInGraph']); + } else { + var currentPeriod = piwikPeriods.parse(self.param['period'], self.param['date']); + } var endDateOfPeriod = currentPeriod.getDateRange()[1]; endDateOfPeriod = piwikPeriods.format(endDateOfPeriod); -- cgit v1.2.3