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

scrollable panels: fix initial content size (#9960)

Browse Source
This commit is contained in:
Alexander Zobnin 2017-11-22 09:05:33 +03:00 committed by Torkel Ödegaard
parent 830c307bba
commit 18ca7a53aa
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/panel/panel_ctrl.ts
View File

@ -6,7 +6,7 @@ import Remarkable from 'remarkable';
import {GRID_CELL_HEIGHT, GRID_CELL_VMARGIN} from 'app/core/constants';
const TITLE_HEIGHT = 27;
const PANEL_BORDER = 2;
const PANEL_BORDER = 12;
import {Emitter} from 'app/core/core';
@ -62,6 +62,7 @@ export class PanelCtrl {
}
refresh() {
this.setPanelHeight();
this.events.emit('refresh', null);
}
@ -70,6 +71,7 @@ export class PanelCtrl {
}
changeView(fullscreen, edit) {
this.setPanelHeight();
this.publishAppEvent('panel-change-view', {
fullscreen: fullscreen, edit: edit, panelId: this.panel.id
});
@ -168,8 +170,15 @@ export class PanelCtrl {
console.log(PANEL_BORDER + TITLE_HEIGHT);
}
setPanelHeight() {
if (this.$scope.setPanelHeight) {
this.$scope.setPanelHeight();
}
}
render(payload?) {
this.timing.renderStart = new Date().getTime();
this.setPanelHeight();
this.events.emit('render', payload);
}

14
public/app/features/panel/panel_directive.ts
View File

@ -65,6 +65,7 @@ module.directive('grafanaPanel', function($rootScope, $document) {
var cornerInfoElem = elem.find('.panel-info-corner');
var ctrl = scope.ctrl;
var infoDrop;
var panelScrollbar;
// the reason for handling these classes this way is for performance
// limit the watchers on panels etc
@ -90,13 +91,24 @@ module.directive('grafanaPanel', function($rootScope, $document) {
if (ctrl.__proto__.constructor.scrollable) {
panelContent.addClass('panel-content--scrollable');
var myScrollbar = new GeminiScrollbar({
panelScrollbar = new GeminiScrollbar({
autoshow: false,
element: panelContent[0]
}).create();
}
}
function setPanelHeight() {
panelContent.height(ctrl.height);
if (panelScrollbar) {
panelScrollbar.update();
}
}
if (ctrl.__proto__.constructor.scrollable) {
ctrl.$scope.setPanelHeight = setPanelHeight;
}
// set initial transparency
if (ctrl.panel.transparent) {
transparentLastState = true;