diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:39:29 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:39:29 +0300 |
commit | 2cb4cb2ee3bc2d34eb1c24f7643e7cfae84e4d17 (patch) | |
tree | e60bd4c5800d48d22efaf97f03c3ea6b8d62143c /app/assets/javascripts | |
parent | c05604a6c26651fde909a3e3d9ab59cbf4191056 (diff) | |
parent | 541e663c125f322cdbb680a9081f2e8470d9ef4e (diff) |
Merge branch 'issue_17607' into 'master'
Fix local timeago on user dashboard
## What does this MR do?
Fixes incorrect date times on tooltips on the dashboard page
## Are there points in the code the reviewer needs to double check?
Yes, The tooltip has to be recreated again because we needed a custom CSS classname in order to fix the date being splitted into two lines.
## Why was this MR needed?
Because the datetimes were incorrect we have to have the same format for .timeago() instances.
## What are the relevant issue numbers?
#17607
## Screenshots (if relevant)
**Before**
<img src="/uploads/f40cd58e8086d9675262e98a1fe57885/Screen_Shot_2016-05-24_at_7.23.25_PM.png" width="705">
**After**
<img src="/uploads/bd48046ef11659cc742f827b3404fbcd/Screen_Shot_2016-05-24_at_7.22.29_PM.png" width="704">
See merge request !4285
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/activities.js.coffee | 5 | ||||
-rw-r--r-- | app/assets/javascripts/lib/datetime_utility.js.coffee | 9 | ||||
-rw-r--r-- | app/assets/javascripts/pager.js.coffee | 3 | ||||
-rw-r--r-- | app/assets/javascripts/user_tabs.js.coffee | 3 |
4 files changed, 17 insertions, 3 deletions
diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee index 5092e824e65..ed5a5d0260c 100644 --- a/app/assets/javascripts/activities.js.coffee +++ b/app/assets/javascripts/activities.js.coffee @@ -1,11 +1,14 @@ class @Activities constructor: -> - Pager.init 20, true + Pager.init 20, true, false, @updateTooltips $(".event-filter-link").on "click", (event) => event.preventDefault() @toggleFilter($(event.currentTarget)) @reloadActivities() + updateTooltips: -> + gl.utils.localTimeAgo($('.js-timeago', '#activity')) + reloadActivities: -> $(".content_list").html '' Pager.init 20, true diff --git a/app/assets/javascripts/lib/datetime_utility.js.coffee b/app/assets/javascripts/lib/datetime_utility.js.coffee index ad1d1c70481..948d6dbf07e 100644 --- a/app/assets/javascripts/lib/datetime_utility.js.coffee +++ b/app/assets/javascripts/lib/datetime_utility.js.coffee @@ -12,6 +12,13 @@ $el.attr('title', gl.utils.formatDate($el.attr('datetime'))) ) - $timeagoEls.timeago() if setTimeago + if setTimeago + $timeagoEls.timeago() + $timeagoEls.tooltip('destroy') + + # Recreate with custom template + $timeagoEls.tooltip( + template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' + ) ) window diff --git a/app/assets/javascripts/pager.js.coffee b/app/assets/javascripts/pager.js.coffee index 0ff83b7f0c8..8049c5c30e2 100644 --- a/app/assets/javascripts/pager.js.coffee +++ b/app/assets/javascripts/pager.js.coffee @@ -1,5 +1,5 @@ @Pager = - init: (@limit = 0, preload, @disable = false) -> + init: (@limit = 0, preload, @disable = false, @callback = $.noop) -> @loading = $('.loading').first() if preload @@ -19,6 +19,7 @@ @loading.hide() success: (data) -> Pager.append(data.count, data.html) + Pager.callback() dataType: "json" append: (count, html) -> diff --git a/app/assets/javascripts/user_tabs.js.coffee b/app/assets/javascripts/user_tabs.js.coffee index 70614396a4e..29dad21faed 100644 --- a/app/assets/javascripts/user_tabs.js.coffee +++ b/app/assets/javascripts/user_tabs.js.coffee @@ -122,6 +122,9 @@ class @UserTabs @parentEl.find(tabSelector).html(data.html) @loaded[action] = true + # Fix tooltips + gl.utils.localTimeAgo($('.js-timeago', tabSelector)) + loadActivities: (source) -> return if @loaded['activity'] is true |