From b1b8a380615d508659b3000141dcaee66d31f723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 5 Aug 2018 11:18:49 +0200 Subject: [PATCH] refactor: renaming variables, refactoring PR #12796 --- public/app/features/dashboard/dashboard_model.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/features/dashboard/dashboard_model.ts b/public/app/features/dashboard/dashboard_model.ts index 5332357570b..d82492f753b 100644 --- a/public/app/features/dashboard/dashboard_model.ts +++ b/public/app/features/dashboard/dashboard_model.ts @@ -836,16 +836,16 @@ export class DashboardModel { return; } - let maxRows = Math.max( + let currentGridHeight = Math.max( ...this.panels.map(panel => { return panel.gridPos.h + panel.gridPos.y; }) ); //Consider navbar and submenu controls, padding and margin - let availableHeight = window.innerHeight - 55 - 20; - let availableRows = Math.floor(availableHeight / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN)); - let scaleFactor = maxRows / availableRows; + let visibleHeight = window.innerHeight - 55 - 20; + let visibleGridHeight = Math.floor(visibleHeight / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN)); + let scaleFactor = currentGridHeight / visibleGridHeight; this.panels.forEach((panel, i) => { panel.gridPos.y = Math.round(panel.gridPos.y / scaleFactor) || 1;