diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-11 22:19:06 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-11 22:19:06 +0000 |
| commit | 8ef930c41a4c5ccb8b99a62a663c594fa0f0a726 (patch) | |
| tree | 06ae06c229c2e4e439ec05ac6facde9dbe1b74b3 | |
| parent | 0452e0a57e24fdd65f559cc1a8629892714adc7a (diff) | |
| parent | a445630ff353bdd9c5be24ccfd3380c71d3901d1 (diff) | |
| download | gitlab-ce-8ef930c41a4c5ccb8b99a62a663c594fa0f0a726.tar.gz | |
Merge branch 'contrib-calendar-tooltip-name' into 'master'
Added day name to contributions calendar
## What does this MR do?
Adds the day name text into the contributions calendar tooltip.
## What are the relevant issue numbers?
Closes #19367
## Screenshots (if relevant)
See merge request !5065
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/users/calendar.js.coffee | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index eccdcc988fa..dc4df1c47ce 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.10.0 (unreleased) - Add Sidekiq queue duration to transaction metrics. - Add a new column `artifacts_size` to table `ci_builds` !4964 - Let Workhorse serve format-patch diffs + - Added day name to contribution calendar tooltips - Make images fit to the size of the viewport !4810 - Fix check for New Branch button on Issue page !4630 (winniehell) - Fix MR-auto-close text added to description. !4836 diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js.coffee b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee index 948d6dbf07e..178963fe0aa 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js.coffee +++ b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee @@ -2,10 +2,14 @@ w.gl ?= {} w.gl.utils ?= {} + w.gl.utils.days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'] w.gl.utils.formatDate = (datetime) -> dateFormat(datetime, 'mmm d, yyyy h:MMtt Z') + w.gl.utils.getDayName = (date) -> + this.days[date.getDay()] + w.gl.utils.localTimeAgo = ($timeagoEls, setTimeago = true) -> $timeagoEls.each( -> $el = $(@) diff --git a/app/assets/javascripts/users/calendar.js.coffee b/app/assets/javascripts/users/calendar.js.coffee index c081f023b04..c49ba5186f2 100644 --- a/app/assets/javascripts/users/calendar.js.coffee +++ b/app/assets/javascripts/users/calendar.js.coffee @@ -87,14 +87,15 @@ class @Calendar .attr 'width', @daySize .attr 'height', @daySize .attr 'title', (stamp) => + date = new Date(stamp.date) contribText = 'No contributions' if stamp.count > 0 contribText = "#{stamp.count} contribution#{if stamp.count > 1 then 's' else ''}" - date = dateFormat(stamp.date, 'mmm d, yyyy') + dateText = dateFormat(date, 'mmm d, yyyy') - "#{contribText}<br />#{date}" + "#{contribText}<br />#{gl.utils.getDayName(date)} #{dateText}" .attr 'class', 'user-contrib-cell js-tooltip' .attr 'fill', (stamp) => if stamp.count isnt 0 |