diff options
| author | Stefan Giehl <stefan@matomo.org> | 2022-08-02 11:35:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 11:35:36 +0300 |
| commit | d298c61aa158cc9e182dfa93b7332e839b7d615b (patch) | |
| tree | 1940517a6790f6c387b0413273ef6ff64743f2a7 | |
| parent | f14f966bc6eefba4afda8d52f5525101c21e0697 (diff) | |
Fix placing series / series picker in charts (#19588)
* Fix placing series / series picker in charts
* Updates UI screenshot
Co-authored-by: Ben <ben.burgess@innocraft.com>
3 files changed, 5 insertions, 3 deletions
diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js index 78e00cb3f2..00191c38d2 100644 --- a/plugins/CoreVisualizations/javascripts/jqplot.js +++ b/plugins/CoreVisualizations/javascripts/jqplot.js @@ -1221,7 +1221,7 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () { var plot = this; $(seriesPicker).bind('placeSeriesPicker', function () { this.domElem.css('margin-left', plot._gridPadding.left + 'px'); - $('.jqplot-legend-canvas').css({paddingLeft: '34px'}); + $('.jqplot-legend-canvas', $('#' + target)).css({paddingLeft: '34px'}); plot.baseCanvas._elem.before(this.domElem); }); diff --git a/plugins/Goals/tests/UI/GoalsPages_spec.js b/plugins/Goals/tests/UI/GoalsPages_spec.js index 0b2adbe167..6674b25a3a 100644 --- a/plugins/Goals/tests/UI/GoalsPages_spec.js +++ b/plugins/Goals/tests/UI/GoalsPages_spec.js @@ -51,6 +51,7 @@ describe("GoalsPages", function () { await page.waitForSelector('.ui-dialog'); await page.waitForNetworkIdle(); + await page.waitForTimeout(200); const dialog = await page.$('.ui-dialog'); expect(await dialog.screenshot()).to.matchImage('overview_row_evolution_reloaded'); @@ -103,6 +104,7 @@ describe("GoalsPages", function () { await page.waitForSelector('.ui-dialog'); await page.waitForNetworkIdle(); + await page.waitForTimeout(200); const dialog = await page.$('.ui-dialog'); expect(await dialog.screenshot()).to.matchImage('individual_row_evolution_reloaded'); diff --git a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_row_evolution_reloaded.png b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_row_evolution_reloaded.png index f33eddee94..96f11bda6b 100644 --- a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_row_evolution_reloaded.png +++ b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_row_evolution_reloaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a554ae7a8249dd867010724260abf32dd65351433f28c2c07ff4fac309b1f4ae -size 59883 +oid sha256:bd0af5841ad6cf391fae350c0212f1e1c149e3f3e70b367e84930e70d15be7f7 +size 59765 |
