diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-08 19:05:39 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-08 19:05:39 +0000 |
| commit | bcf407a2f887d065e515912514a69da942220db5 (patch) | |
| tree | cdb4638bdb576295916a5d7958ec2cbd05fb6874 | |
| parent | 10d4b20ad18b735e45da492a1af30b3650df705e (diff) | |
| parent | eb8a713caac13de61321970c4dc2715e1c0929f2 (diff) | |
| download | gitlab-ce-bcf407a2f887d065e515912514a69da942220db5.tar.gz | |
Merge branch 'timeago-perf-fix' into 'master'
Fixed timeago re-rendering every element
## What does this MR do?
Fixes an issue when new notes are added timeago will be initialised for every timeago element on the page again and therefore adding more timeouts.
See merge request !7969
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/timeago-perf-fix.yml | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index 963d2851e5f..e8e502694d6 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -29,7 +29,7 @@ setTimeago = true; } - $timeagoEls.each(function() { + $timeagoEls.filter(':not([data-timeago-rendered])').each(function() { var $el = $(this); $el.attr('title', gl.utils.formatDate($el.attr('datetime'))); @@ -39,6 +39,8 @@ 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); gl.utils.renderTimeago($el); }); }; diff --git a/changelogs/unreleased/timeago-perf-fix.yml b/changelogs/unreleased/timeago-perf-fix.yml new file mode 100644 index 00000000000..265e7db29a9 --- /dev/null +++ b/changelogs/unreleased/timeago-perf-fix.yml @@ -0,0 +1,4 @@ +--- +title: Fixed timeago re-rendering every timeago +merge_request: +author: |