IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(legend): only add overflow scroll when needed

Browse Source 
In firefox the scrollbar is always show when setting
overflow: scroll. This commit makes sure the overflow
setting is only applied when needed.

closes #4049
This commit is contained in:
bergquist
2016-02-18 11:08:13 +01:00
parent b9059181fd
commit 63ca9f6f5a
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/plugins/panel/graph/legend.js
View File

@@ -90,14 +90,6 @@ function (angular, _, $) {
}
function render() {
if (panel.legend.rightSide) {
var panelheight = scope.ctrl.height || scope.ctrl.panel.height || scope.ctrl.row.height;
$container.css("height", panelheight);
$container.toggleClass('graph-legend-fixed-height', true);
} else {
$container.css("height", "");
}
if (firstRender) {
elem.append($container);
$container.on('click', '.graph-legend-icon', openColorSelector);
@@ -184,6 +176,19 @@ function (angular, _, $) {
html += '</div>';
$container.append($(html));
}
var legendContainerHeight = $container.parent().height();
var legendHeight = $container.height();
if (panel.legend.rightSide && legendHeight >= legendContainerHeight) {
$container.toggleClass('graph-legend-fixed-height', true);
}
if (panel.legend.rightSide) {
$container.css("height", scope.ctrl.height || scope.ctrl.panel.height || scope.ctrl.row.height);
} else {
$container.css("height", "");
}
}
}
};