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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
4bd1b550
Commit
4bd1b550
authored
Feb 07, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'timeago-perf' into 'master'
Improved timeago performance Closes #25728 See merge request !8231
parents
f7d900aa
1c7cce9e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
128 additions
and
0 deletions
+128
-0
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+2
-0
app/assets/javascripts/lib/utils/datetime_utility.js.es6
app/assets/javascripts/lib/utils/datetime_utility.js.es6
+126
-0
No files found.
app/assets/javascripts/application.js
View file @
4bd1b550
...
@@ -247,5 +247,7 @@ window.ES6Promise.polyfill();
...
@@ -247,5 +247,7 @@ window.ES6Promise.polyfill();
new
Aside
();
new
Aside
();
// bind sidebar events
// bind sidebar events
new
gl
.
Sidebar
();
new
gl
.
Sidebar
();
gl
.
utils
.
initTimeagoTimeout
();
});
});
}).
call
(
this
);
}).
call
(
this
);
app/assets/javascripts/lib/utils/datetime_utility.js
→
app/assets/javascripts/lib/utils/datetime_utility.js
.es6
View file @
4bd1b550
...
@@ -8,6 +8,8 @@ window.dateFormat = require('vendor/date.format');
...
@@ -8,6 +8,8 @@ window.dateFormat = require('vendor/date.format');
(function() {
(function() {
(function(w) {
(function(w) {
var base;
var base;
var timeagoInstance;
if (w.gl == null) {
if (w.gl == null) {
w.gl = {};
w.gl = {};
}
}
...
@@ -24,49 +26,51 @@ window.dateFormat = require('vendor/date.format');
...
@@ -24,49 +26,51 @@ window.dateFormat = require('vendor/date.format');
return this.days[date.getDay()];
return this.days[date.getDay()];
};
};
w
.
gl
.
utils
.
localTimeAgo
=
function
(
$timeagoEls
,
setTimeago
)
{
w.gl.utils.localTimeAgo = function($timeagoEls, setTimeago = true) {
if
(
setTimeago
==
null
)
{
$timeagoEls.each((i, el) => {
setTimeago
=
true
;
el.setAttribute('title', gl.utils.formatDate(el.getAttribute('datetime')));
}
$timeagoEls
.
filter
(
'
:not([data-timeago-rendered])
'
).
each
(
function
()
{
var
$el
=
$
(
this
);
$el
.
attr
(
'
title
'
,
gl
.
utils
.
formatDate
(
$el
.
attr
(
'
datetime
'
)));
if (setTimeago) {
if (setTimeago) {
// Recreate with custom template
// Recreate with custom template
$
el
.
tooltip
({
$
(el)
.tooltip({
template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
});
});
}
}
$el
.
attr
(
'
data-timeago-rendered
'
,
true
);
el.classList.add('js-timeago-render');
gl
.
utils
.
renderTimeago
(
$el
);
});
});
gl.utils.renderTimeago($timeagoEls);
};
};
w.gl.utils.getTimeago = function() {
w.gl.utils.getTimeago = function() {
var
locale
=
function
(
number
,
index
)
{
var locale;
return
[
[
'
less than a minute ago
'
,
'
a while
'
],
if (!timeagoInstance) {
[
'
less than a minute ago
'
,
'
in %s seconds
'
],
locale = function(number, index) {
[
'
about a minute ago
'
,
'
in 1 minute
'
],
return [
[
'
%s minutes ago
'
,
'
in %s minutes
'
],
['less than a minute ago', 'a while'],
[
'
about an hour ago
'
,
'
in 1 hour
'
],
['less than a minute ago', 'in %s seconds'],
[
'
about %s hours ago
'
,
'
in %s hours
'
],
['about a minute ago', 'in 1 minute'],
[
'
a day ago
'
,
'
in 1 day
'
],
['%s minutes ago', 'in %s minutes'],
[
'
%s days ago
'
,
'
in %s days
'
],
['about an hour ago', 'in 1 hour'],
[
'
a week ago
'
,
'
in 1 week
'
],
['about %s hours ago', 'in %s hours'],
[
'
%s weeks ago
'
,
'
in %s weeks
'
],
['a day ago', 'in 1 day'],
[
'
a month ago
'
,
'
in 1 month
'
],
['%s days ago', 'in %s days'],
[
'
%s months ago
'
,
'
in %s months
'
],
['a week ago', 'in 1 week'],
[
'
a year ago
'
,
'
in 1 year
'
],
['%s weeks ago', 'in %s weeks'],
[
'
%s years ago
'
,
'
in %s years
'
]
['a month ago', 'in 1 month'],
][
index
];
['%s months ago', 'in %s months'],
};
['a year ago', 'in 1 year'],
['%s years ago', 'in %s years']
timeago
.
register
(
'
gl_en
'
,
locale
);
][index];
return
timeago
();
};
timeago.register('gl_en', locale);
timeagoInstance = timeago();
}
return timeagoInstance;
};
};
w.gl.utils.timeFor = function(time, suffix, expiredLabel) {
w.gl.utils.timeFor = function(time, suffix, expiredLabel) {
...
@@ -85,9 +89,30 @@ window.dateFormat = require('vendor/date.format');
...
@@ -85,9 +89,30 @@ window.dateFormat = require('vendor/date.format');
return timefor;
return timefor;
};
};
w
.
gl
.
utils
.
renderTimeago
=
function
(
$element
)
{
w.gl.utils.cachedTimeagoElements = [];
var
timeagoInstance
=
gl
.
utils
.
getTimeago
();
w.gl.utils.renderTimeago = function($els) {
timeagoInstance
.
render
(
$element
,
'
gl_en
'
);
if (!$els && !w.gl.utils.cachedTimeagoElements.length) {
w.gl.utils.cachedTimeagoElements = [].slice.call(document.querySelectorAll('.js-timeago-render'));
} else if ($els) {
w.gl.utils.cachedTimeagoElements = w.gl.utils.cachedTimeagoElements.concat($els.toArray());
}
w.gl.utils.cachedTimeagoElements.forEach(gl.utils.updateTimeagoText);
};
w.gl.utils.updateTimeagoText = function(el) {
const timeago = gl.utils.getTimeago();
const formattedDate = timeago.format(el.getAttribute('datetime'), 'gl_en');
if (el.textContent !== formattedDate) {
el.textContent = formattedDate;
}
};
w.gl.utils.initTimeagoTimeout = function() {
gl.utils.renderTimeago();
gl.utils.timeagoTimeout = setTimeout(gl.utils.initTimeagoTimeout, 1000);
};
};
w.gl.utils.getDayDifference = function(a, b) {
w.gl.utils.getDayDifference = function(a, b) {
...
...
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