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
2cb83cf1
Commit
2cb83cf1
authored
Dec 16, 2015
by
carl bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style(graph.tooltip): moves checkdate logic inside each method.
I find it easier to follow and checkdate didnt do much.
parent
8c02a7bd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
12 deletions
+2
-12
public/app/features/dashboard/dashboardSrv.js
+2
-12
No files found.
public/app/features/dashboard/dashboardSrv.js
View file @
2cb83cf1
...
@@ -214,9 +214,7 @@ function (angular, $, _, moment) {
...
@@ -214,9 +214,7 @@ function (angular, $, _, moment) {
};
};
p
.
formatDate
=
function
(
date
,
format
)
{
p
.
formatDate
=
function
(
date
,
format
)
{
date
=
moment
.
isMoment
(
date
)
?
date
:
moment
(
date
);
date
=
this
.
checkDate
(
date
);
format
=
format
||
'YYYY-MM-DD HH:mm:ss'
;
format
=
format
||
'YYYY-MM-DD HH:mm:ss'
;
return
this
.
timezone
===
'browser'
?
return
this
.
timezone
===
'browser'
?
...
@@ -225,21 +223,13 @@ function (angular, $, _, moment) {
...
@@ -225,21 +223,13 @@ function (angular, $, _, moment) {
};
};
p
.
getRelativeTime
=
function
(
date
)
{
p
.
getRelativeTime
=
function
(
date
)
{
date
=
moment
.
isMoment
(
date
)
?
date
:
moment
(
date
);
date
=
this
.
checkDate
(
date
);
return
this
.
timezone
===
'browser'
?
return
this
.
timezone
===
'browser'
?
moment
(
date
).
fromNow
()
:
moment
(
date
).
fromNow
()
:
moment
.
utc
(
date
).
fromNow
();
moment
.
utc
(
date
).
fromNow
();
};
};
p
.
checkDate
=
function
(
date
)
{
if
(
!
moment
.
isMoment
(
date
))
{
date
=
moment
(
date
);
}
return
date
;
};
p
.
_updateSchema
=
function
(
old
)
{
p
.
_updateSchema
=
function
(
old
)
{
var
i
,
j
,
k
;
var
i
,
j
,
k
;
var
oldVersion
=
this
.
schemaVersion
;
var
oldVersion
=
this
.
schemaVersion
;
...
...
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