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 | |
parent | 9076064890c4b3705debe409cbf7c0542b23dc3f (diff) |
Prevent label column from getting narrower when opening subtables (#12133)
* calculate width for each label column
* updates screenshots
5 files changed, 17 insertions, 34 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)); }); diff --git a/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png index 874f64f85b..c51b9f14eb 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25514d318c6bce2ac6a3981ce20f56d68383cf2aa920381aec25ad0f31f538c4 -size 355515 +oid sha256:0e1b77568aa2e64b27ed2075fd140ef249390c679d4d77b5bfe90af0d3424f30 +size 356940 diff --git a/tests/UI/expected-screenshots/ActionsDataTable_search.png b/tests/UI/expected-screenshots/ActionsDataTable_search.png index 12be0114bc..ceef7822a2 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_search.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cd24288bab08727cb9a6cf32237b536e7085d3365d58c88d0c28aba60410dca -size 77110 +oid sha256:45a08f49df7120c70ad4dfff7c34555c4176ac901d85df34effced315b7e3182 +size 76316 diff --git a/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png index 60da611d46..6872a730a9 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b121015173e34025f68e7b140385b4c585bab135fe677a75c9684d43ef505c7 -size 360808 +oid sha256:b3ce7221353104bb30cf3a05c59ddcc919f7c8af34c3c2ab1f1cfe2785abdd8a +size 360331 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png index 9b4e00c8be..7a71678796 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63023d24fadff099ede1fc04ac0cf80e62e096e66cfa62788fb3c96e91a4131c -size 71043 +oid sha256:c22ec3f63ed0d12d546eb2724d1004fec13707861d9f5ccba15941fc7df4dc9e +size 71045 |