diff options
author | Stefan Giehl <stefan@piwik.org> | 2017-10-04 23:20:54 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-10-04 23:20:54 +0300 |
commit | a2e369e10d0cdc314540b5d3e4fe0da08e6cc7c5 (patch) | |
tree | f1499d0facd260c294970ae55449c5aa7e1c3728 /plugins | |
parent | 9076064890c4b3705debe409cbf7c0542b23dc3f (diff) |
Prevent label column from getting narrower when opening subtables (#12133)
* calculate width for each label column
* updates screenshots
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/CoreHome/javascripts/dataTable.js | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 4fa6e14f7b..2120dd5a46 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -497,27 +497,13 @@ $.extend(DataTable.prototype, UIControl.prototype, { return parseInt(maxWidth, 10); } - function removePaddingFromWidth(domElem, labelWidth) { - var maxPaddingLeft = 0; - var maxPaddingRight = 0; + function removePaddingFromWidth(elem, labelWidth) { + var paddingLeft = elem.css('paddingLeft'); + paddingLeft = paddingLeft ? Math.round(parseFloat(paddingLeft)) : 0; + var paddingRight = elem.css('paddingRight'); + paddingRight = paddingRight ? Math.round(parseFloat(paddingLeft)) : 0; - $('tbody tr td.label', domElem).each(function (i, node) { - $node = $(node); - - var paddingLeft = $node.css('paddingLeft'); - paddingLeft = paddingLeft ? Math.round(parseFloat(paddingLeft)) : 0; - var paddingRight = $node.css('paddingRight'); - paddingRight = paddingRight ? Math.round(parseFloat(paddingLeft)) : 0; - - if (paddingLeft > maxPaddingLeft) { - maxPaddingLeft = paddingLeft; - } - if (paddingRight > maxPaddingRight) { - maxPaddingRight = paddingRight; - } - }); - - labelWidth = labelWidth - maxPaddingLeft - maxPaddingRight; + labelWidth = labelWidth - paddingLeft - paddingRight; return labelWidth; } @@ -531,9 +517,6 @@ $.extend(DataTable.prototype, UIControl.prototype, { if (isTableVisualization) { // we do this only for html tables - var minLabelWidth = 125; - var maxLabelWidth = 440; - var tableWidth = getTableWidth(domElem); var labelColumnMinWidth = getLabelColumnMinWidth(domElem); var labelColumnMaxWidth = getLabelColumnMaxWidth(domElem); @@ -546,10 +529,10 @@ $.extend(DataTable.prototype, UIControl.prototype, { labelColumnWidth = labelColumnMaxWidth; } - labelColumnWidth = removePaddingFromWidth(domElem, labelColumnWidth); - if (labelColumnWidth) { - $('td.label', domElem).width(labelColumnWidth); + $('td.label', domElem).each(function() { + $(this).width(removePaddingFromWidth($(this), labelColumnWidth)); + }); } $('td span.label', domElem).each(function () { self.tooltip($(this)); }); |