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 /plugins/CoreHome | |
parent | 997389d5c9ebd6df5c8da1aac7318f2f053043ad (diff) |
Fix label truncation calculation (#15068)
* Fix label truncation calculation
regrssion of #14365
* updates expected screenshots
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r-- | plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less | 6 | ||||
-rw-r--r-- | plugins/CoreHome/javascripts/dataTable.js | 4 |
2 files changed, 3 insertions, 7 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; |