diff options
author | Stefan Giehl <stefan@matomo.org> | 2019-10-29 07:14:12 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2019-10-29 07:14:12 +0300 |
commit | 2edbd2706ed3fc0732dcdc16e87130aed0bebe85 (patch) | |
tree | 931667ea134b0438d2bc6565fb5cdbd129a607b9 | |
parent | 997389d5c9ebd6df5c8da1aac7318f2f053043ad (diff) |
Fix label truncation calculation (#15068)
* Fix label truncation calculation
regrssion of #14365
* updates expected screenshots
7 files changed, 13 insertions, 17 deletions
diff --git a/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less b/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less index 94b1a3d5d0..45870162f4 100644 --- a/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less +++ b/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less @@ -5,17 +5,13 @@ } .reportContainer { - position: absolute; margin-left: 230px; min-width: 500px; + overflow: auto; table.dataTable tr td.label { max-width: 380px; } - - table.dataTable { - width: auto; - } } } diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index dd00113ed7..073781f369 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -538,6 +538,8 @@ $.extend(DataTable.prototype, UIControl.prototype, { return labelWidth; } + setMaxTableWidthIfNeeded(domElem, 1200); + var isTableVisualization = this.jsViewDataTable && typeof this.jsViewDataTable === 'string' && typeof this.jsViewDataTable.indexOf === 'function' @@ -568,8 +570,6 @@ $.extend(DataTable.prototype, UIControl.prototype, { self.overflowContentIfNeeded(domElem); } - setMaxTableWidthIfNeeded(domElem, 1200); - if (!self.windowResizeTableAttached) { self.windowResizeTableAttached = true; diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png index 337fd35533..da7457d5db 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31f436fa4bab9d9eed42a03f49a5c106fe120c9d7d4747b8f703e74226ae03eb -size 41834 +oid sha256:ab3fc66fb20f8f62fa88d084f37e7f80f266247d376bdcc0f24379c7f8db13df +size 41875 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png index 2b860766cf..81cdf12fe2 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be258499b3291cf74b37ec7004ec1feb7693e3a3a16a8ae0556154a1cea9f9da -size 40509 +oid sha256:64eebf7d88a9e0a389c83439014fa3849693fd83831ac301f45abb4960a2ddc9 +size 40551 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png index a3d076ebbc..26eff2a3df 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcc6a853eea500d0fe8dbda48393ef0dfe495d11a353bb94641e14cbaeca1197 -size 48703 +oid sha256:559a11a9aa6b19309ae6b740fd349418a51eac87e8cd62a9df97f51fe96b6624 +size 48745 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png index 8b7ae1bd7f..ae3be4aa25 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b8b4c68ba2b6eff29a3e847547eab9979b9176ce3ea6771f5c1e4a15643020f -size 28824 +oid sha256:40d77f9e08f8384d453790d3b9d997bab5b95973f935f7e2240d661780960274 +size 28853 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png index eccad133ae..557e45fe37 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4662b660d5a836b63671fdd65368037393956483aca3f378bf8bcf479b825f58 -size 88021 +oid sha256:509df76e627783da161e890ce59c71aa1b372a2cd62c51d6fa160a44bbf8ef3a +size 84599 |