浏览代码

refactor: renaming variables, refactoring PR #12796

Torkel Ödegaard 7 年之前
父节点
当前提交
b1b8a38061
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      public/app/features/dashboard/dashboard_model.ts

+ 4 - 4
public/app/features/dashboard/dashboard_model.ts

@@ -836,16 +836,16 @@ export class DashboardModel {
       return;
       return;
     }
     }
 
 
-    let maxRows = Math.max(
+    let currentGridHeight = Math.max(
       ...this.panels.map(panel => {
       ...this.panels.map(panel => {
         return panel.gridPos.h + panel.gridPos.y;
         return panel.gridPos.h + panel.gridPos.y;
       })
       })
     );
     );
 
 
     //Consider navbar and submenu controls, padding and margin
     //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) => {
     this.panels.forEach((panel, i) => {
       panel.gridPos.y = Math.round(panel.gridPos.y / scaleFactor) || 1;
       panel.gridPos.y = Math.round(panel.gridPos.y / scaleFactor) || 1;