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

fix(dashboard): minor fixes, and restored in-activity timer to 1min

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-11-17 10:11:59 +01:00
parent 42167a65c6
commit a45fdfdd3f
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
// handle in active view state class
var lastActivity = new Date().getTime();
var activeUser = true;
var inActiveTimeLimit = 10 * 1000;
var inActiveTimeLimit = 60 * 1000;
function checkForInActiveUser() {
if (!activeUser) {

2
public/app/features/dashboard/row/add_panel.html
View File

@ -5,7 +5,7 @@
<div class="gf-form-inline dash-row-add-panel-form">
<div class="gf-form">
<input type="text" class="gf-form-input max-width-14" ng-model='ctrl.panelSearch' give-focus='true' ng-keydown="ctrl.keyDown($event)" ng-change="ctrl.panelSearchChanged()" placeholder="panel search filter" ng-blur="ctrl.panelSearchBlur()"></input>
<input type="text" class="gf-form-input max-width-14" ng-model='ctrl.panelSearch' give-focus='true' ng-keydown="ctrl.keyDown($event)" ng-change="ctrl.panelSearchChanged()" placeholder="panel search filter"></input>
</div>
</div>

6
public/app/features/dashboard/row/add_panel.ts
View File

@ -45,12 +45,6 @@ export class AddPanelCtrl {
}
}
panelSearchBlur() {
// this.$timeout(() => {
// this.rowCtrl.dropView = 0;
// }, 400);
}
moveSelection(direction) {
var max = this.panelHits.length;
var newIndex = this.activeIndex + direction;

2
public/app/features/dashboard/row/row_ctrl.ts
View File

@ -19,7 +19,6 @@ export class DashRowCtrl {
if (this.row.isNew) {
this.dropView = 1;
delete this.row.isNew;
}
}
@ -36,7 +35,6 @@ export class DashRowCtrl {
type: panelId,
id: this.dashboard.getNextPanelId(),
},
isNew: true,
};
} else {
dragObject = this.dashboard.getPanelInfoById(panelId);

4
public/app/features/dashboard/row/row_model.ts
View File

@ -34,6 +34,10 @@ export class DashboardRow {
getSaveModel() {
assignModelProperties(this.model, this, this.defaults);
// remove properties that dont server persisted purpose
delete this.model.isNew;
return this.model;
}