Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2022-06-28 08:39:36 +0300
committerGitHub <noreply@github.com>2022-06-28 08:39:36 +0300
commitdf9b36323662b0865380739ea6da50e4e595f02c (patch)
tree1797031d79f8444f32c03f2779f803c239280aac
parented6652b2e3937b02d9ca519b195298e231acc24d (diff)
Fix number formatting in additional Y axis in (evolution) charts (#19360)
* Fix number formatting in additional Y axis in evolution charts * updates expected UI files
-rw-r--r--plugins/CoreVisualizations/javascripts/jqplot.js9
-rw-r--r--tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png4
2 files changed, 10 insertions, 3 deletions
diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js
index 1e9ccac4bd..d93608191b 100644
--- a/plugins/CoreVisualizations/javascripts/jqplot.js
+++ b/plugins/CoreVisualizations/javascripts/jqplot.js
@@ -123,12 +123,19 @@ function rowEvolutionGetMetricNameFromRow(tr)
formatString: '%s',
formatter: $.jqplot.NumberFormatter
}
- }
+ },
}
};
this.jqplotParams = $.extend(true, {}, defaultParams, params);
+ for (var i = 2; typeof this.jqplotParams.axes['y' + i + 'axis'] != 'undefined'; i++) {
+ this.jqplotParams.axes['y' + i + 'axis'].tickOptions = $.extend(true, {}, {
+ formatString: '%s',
+ formatter: $.jqplot.NumberFormatter
+ }, this.jqplotParams.axes['y' + i + 'axis'].tickOptions);
+ }
+
this._setColors();
},
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png
index e27618a188..5f4f6fe707 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:acd073900f58d1bff4aa3fb68b1987c658e0b2c53f6f0bfb7aaf5f8956e2f14d
-size 107634
+oid sha256:f7111399d9c3755037d20a36a10a6c661a326f37cfd36e6f182eb4c2aabfca9b
+size 107910