mirror of
https://github.com/grafana/grafana.git
synced 2024-11-30 12:44:10 -06:00
Merge branch 'v3.0.x'
This commit is contained in:
commit
06d63dda6e
@ -142,12 +142,18 @@ function (angular, _, config) {
|
||||
});
|
||||
|
||||
module.directive('panelWidth', function() {
|
||||
var fullscreen = false;
|
||||
|
||||
return function(scope, element) {
|
||||
function updateWidth() {
|
||||
element[0].style.width = ((scope.panel.span / 1.2) * 10) + '%';
|
||||
if (!fullscreen) {
|
||||
element[0].style.width = ((scope.panel.span / 1.2) * 10) + '%';
|
||||
}
|
||||
}
|
||||
|
||||
scope.onAppEvent('panel-fullscreen-enter', function(evt, info) {
|
||||
fullscreen = true;
|
||||
|
||||
if (scope.panel.id !== info.panelId) {
|
||||
element.hide();
|
||||
} else {
|
||||
@ -156,14 +162,20 @@ function (angular, _, config) {
|
||||
});
|
||||
|
||||
scope.onAppEvent('panel-fullscreen-exit', function(evt, info) {
|
||||
fullscreen = false;
|
||||
|
||||
if (scope.panel.id !== info.panelId) {
|
||||
element.show();
|
||||
} else {
|
||||
updateWidth();
|
||||
}
|
||||
|
||||
updateWidth();
|
||||
});
|
||||
|
||||
scope.$watch('panel.span', updateWidth);
|
||||
|
||||
if (fullscreen) {
|
||||
element.hide();
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user