IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 04:04:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

scrollbar: fix dashboard width updating for different modes

Browse Source
This commit is contained in:
Alexander Zobnin 2018-04-04 19:51:12 +03:00
parent 175937a679
commit b69316752a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/components/grafana_app.ts
View File

@ -167,6 +167,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
if (sidemenuHidden) { if (sidemenuHidden) {
sidemenuHidden = false; sidemenuHidden = false;
body.addClass('sidemenu-open'); body.addClass('sidemenu-open');
appEvents.emit('toggle-inactive-mode');
$timeout(function() { $timeout(function() {
$rootScope.$broadcast('render'); $rootScope.$broadcast('render');
}, 100); }, 100);

12
public/app/core/components/scroll/scroll.ts
View File

@ -60,10 +60,16 @@ export function geminiScrollbar() {
scope scope
); );
appEvents.on('toggle-sidemenu', evt => { // force updating dashboard width
// force updating dashboard width appEvents.on('toggle-sidemenu', forceUpdate);
appEvents.on('toggle-sidemenu-hidden', forceUpdate);
appEvents.on('toggle-view-mode', forceUpdate);
appEvents.on('toggle-kiosk-mode', forceUpdate);
appEvents.on('toggle-inactive-mode', forceUpdate);
function forceUpdate() {
scrollbar.scroll(); scrollbar.scroll();
}); }
scope.$on('$routeChangeSuccess', () => { scope.$on('$routeChangeSuccess', () => {
lastPos = 0; lastPos = 0;