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

Minor code refinements to panel repeat code, #1888

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-04-30 10:50:23 +02:00
parent 25ef49494b
commit 32e0ce1beb
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/dashboard/dynamicDashboardSrv.js
View File

@ -24,14 +24,11 @@ function (angular, _) {
if (dashboard.templating.list.length === 0) { return; } if (dashboard.templating.list.length === 0) { return; }
this.dashboard = dashboard; this.dashboard = dashboard;
this.handlePanelRepeats();
this.handleRowRepeats();
};
this.handlePanelRepeats = function() {
var i, j, row, panel; var i, j, row, panel;
for (i = 0; i < this.dashboard.rows.length; i++) { for (i = 0; i < this.dashboard.rows.length; i++) {
row = this.dashboard.rows[i]; row = this.dashboard.rows[i];
// repeat panels first
for (j = 0; j < row.panels.length; j++) { for (j = 0; j < row.panels.length; j++) {
panel = row.panels[j]; panel = row.panels[j];
if (panel.repeat) { if (panel.repeat) {
@ -43,13 +40,8 @@ function (angular, _) {
j = j - 1; j = j - 1;
} }
} }
}
};
this.handleRowRepeats = function() { // handle row repeats
var i, row;
for (i = 0; i < this.dashboard.rows.length; i++) {
row = this.dashboard.rows[i];
if (row.repeat) { if (row.repeat) {
this.repeatRow(row); this.repeatRow(row);
} }
@ -61,6 +53,7 @@ function (angular, _) {
} }
}; };
// returns a new row clone or reuses a clone from previous iteration
this.getRowClone = function(sourceRow, index) { this.getRowClone = function(sourceRow, index) {
if (index === 0) { if (index === 0) {
return sourceRow; return sourceRow;
@ -95,6 +88,7 @@ function (angular, _) {
return copy; return copy;
}; };
// returns a new panel clone or reuses a clone from previous iteration
this.repeatRow = function(row) { this.repeatRow = function(row) {
var variables = this.dashboard.templating.list; var variables = this.dashboard.templating.list;
var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')});