Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6401db89
Commit
6401db89
authored
Nov 01, 2019
by
jakeburden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update usage of timeago.js
parent
21cb540a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
63 additions
and
74 deletions
+63
-74
app/assets/javascripts/lib/utils/datetime_utility.js
app/assets/javascripts/lib/utils/datetime_utility.js
+63
-74
No files found.
app/assets/javascripts/lib/utils/datetime_utility.js
View file @
6401db89
import
$
from
'
jquery
'
;
import
_
from
'
underscore
'
;
import
timeago
from
'
timeago.js
'
;
import
*
as
timeago
from
'
timeago.js
'
;
import
dateFormat
from
'
dateformat
'
;
import
{
languageCode
,
s__
,
__
,
n__
}
from
'
../../locale
'
;
...
...
@@ -92,14 +92,10 @@ export const formatDate = (datetime, format = 'mmm d, yyyy h:MMtt Z') => {
*/
const
timeagoLanguageCode
=
languageCode
().
replace
(
/-/g
,
'
_
'
);
let
timeagoInstance
;
/**
*
Sets a timeago Instance
*
Registers timeago locales
*/
export
const
getTimeago
=
()
=>
{
if
(
!
timeagoInstance
)
{
const
memoizedLocaleRemaining
=
()
=>
{
const
memoizedLocaleRemaining
=
()
=>
{
const
cache
=
[];
const
timeAgoLocaleRemaining
=
[
...
...
@@ -126,9 +122,9 @@ export const getTimeago = () => {
cache
[
index
]
=
timeAgoLocaleRemaining
[
index
]
&&
timeAgoLocaleRemaining
[
index
]();
return
cache
[
index
];
};
};
};
const
memoizedLocale
=
()
=>
{
const
memoizedLocale
=
()
=>
{
const
cache
=
[];
const
timeAgoLocale
=
[
...
...
@@ -155,27 +151,20 @@ export const getTimeago = () => {
cache
[
index
]
=
timeAgoLocale
[
index
]
&&
timeAgoLocale
[
index
]();
return
cache
[
index
];
};
};
timeago
.
register
(
timeagoLanguageCode
,
memoizedLocale
());
timeago
.
register
(
`
${
timeagoLanguageCode
}
-remaining`
,
memoizedLocaleRemaining
());
timeagoInstance
=
timeago
();
}
return
timeagoInstance
;
};
timeago
.
register
(
timeagoLanguageCode
,
memoizedLocale
());
timeago
.
register
(
`
${
timeagoLanguageCode
}
-remaining`
,
memoizedLocaleRemaining
());
/**
* For the given elements, sets a tooltip with a formatted date.
* @param {JQuery} $timeagoEls
* @param {Boolean} setTimeago
*/
export
const
localTimeAgo
=
(
$timeagoEls
,
setTimeago
=
true
)
=>
{
getTimeago
();
$timeagoEls
.
each
((
i
,
el
)
=>
{
$
(
el
).
text
(
timeago
Instance
.
format
(
$
(
el
).
attr
(
'
datetime
'
),
timeagoLanguageCode
));
$
(
el
).
text
(
timeago
.
format
(
$
(
el
).
attr
(
'
datetime
'
),
timeagoLanguageCode
));
});
if
(
!
setTimeago
)
{
...
...
@@ -207,7 +196,7 @@ export const timeFor = (time, expiredLabel) => {
if
(
new
Date
(
time
)
<
new
Date
())
{
return
expiredLabel
||
s__
(
'
Timeago|Past due
'
);
}
return
getTimeago
()
return
timeago
.
format
(
time
,
`
${
timeagoLanguageCode
}
-remaining`
)
.
trim
();
};
...
...
@@ -417,7 +406,7 @@ export const dayInQuarter = (date, quarter) =>
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
utils
=
{
...(
window
.
gl
.
utils
||
{}),
getT
imeago
,
t
imeago
,
localTimeAgo
,
};
...
...
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