Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
a45fdfdd
Commit
a45fdfdd
authored
Nov 17, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(dashboard): minor fixes, and restored in-activity timer to 1min
parent
42167a65
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
10 deletions
+6
-10
public/app/core/components/grafana_app.ts
+1
-1
public/app/features/dashboard/row/add_panel.html
+1
-1
public/app/features/dashboard/row/add_panel.ts
+0
-6
public/app/features/dashboard/row/row_ctrl.ts
+0
-2
public/app/features/dashboard/row/row_model.ts
+4
-0
No files found.
public/app/core/components/grafana_app.ts
View file @
a45fdfdd
...
@@ -122,7 +122,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
...
@@ -122,7 +122,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
// handle in active view state class
// handle in active view state class
var
lastActivity
=
new
Date
().
getTime
();
var
lastActivity
=
new
Date
().
getTime
();
var
activeUser
=
true
;
var
activeUser
=
true
;
var
inActiveTimeLimit
=
1
0
*
1000
;
var
inActiveTimeLimit
=
6
0
*
1000
;
function
checkForInActiveUser
()
{
function
checkForInActiveUser
()
{
if
(
!
activeUser
)
{
if
(
!
activeUser
)
{
...
...
public/app/features/dashboard/row/add_panel.html
View file @
a45fdfdd
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<div
class=
"gf-form-inline dash-row-add-panel-form"
>
<div
class=
"gf-form-inline dash-row-add-panel-form"
>
<div
class=
"gf-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>
</div>
</div>
...
...
public/app/features/dashboard/row/add_panel.ts
View file @
a45fdfdd
...
@@ -45,12 +45,6 @@ export class AddPanelCtrl {
...
@@ -45,12 +45,6 @@ export class AddPanelCtrl {
}
}
}
}
panelSearchBlur
()
{
// this.$timeout(() => {
// this.rowCtrl.dropView = 0;
// }, 400);
}
moveSelection
(
direction
)
{
moveSelection
(
direction
)
{
var
max
=
this
.
panelHits
.
length
;
var
max
=
this
.
panelHits
.
length
;
var
newIndex
=
this
.
activeIndex
+
direction
;
var
newIndex
=
this
.
activeIndex
+
direction
;
...
...
public/app/features/dashboard/row/row_ctrl.ts
View file @
a45fdfdd
...
@@ -19,7 +19,6 @@ export class DashRowCtrl {
...
@@ -19,7 +19,6 @@ export class DashRowCtrl {
if
(
this
.
row
.
isNew
)
{
if
(
this
.
row
.
isNew
)
{
this
.
dropView
=
1
;
this
.
dropView
=
1
;
delete
this
.
row
.
isNew
;
}
}
}
}
...
@@ -36,7 +35,6 @@ export class DashRowCtrl {
...
@@ -36,7 +35,6 @@ export class DashRowCtrl {
type
:
panelId
,
type
:
panelId
,
id
:
this
.
dashboard
.
getNextPanelId
(),
id
:
this
.
dashboard
.
getNextPanelId
(),
},
},
isNew
:
true
,
};
};
}
else
{
}
else
{
dragObject
=
this
.
dashboard
.
getPanelInfoById
(
panelId
);
dragObject
=
this
.
dashboard
.
getPanelInfoById
(
panelId
);
...
...
public/app/features/dashboard/row/row_model.ts
View file @
a45fdfdd
...
@@ -34,6 +34,10 @@ export class DashboardRow {
...
@@ -34,6 +34,10 @@ export class DashboardRow {
getSaveModel
()
{
getSaveModel
()
{
assignModelProperties
(
this
.
model
,
this
,
this
.
defaults
);
assignModelProperties
(
this
.
model
,
this
,
this
.
defaults
);
// remove properties that dont server persisted purpose
delete
this
.
model
.
isNew
;
return
this
.
model
;
return
this
.
model
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment