diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-27 16:39:08 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-27 16:39:08 +0000 |
| commit | c39ee747dc34909882527bf48c1b9c1e4f9d528a (patch) | |
| tree | 516974c6ff076f30ee7ad271c61c4f0ed5c70043 | |
| parent | d59f0d90e4eb2feff510cd7fb344e46b0286a1df (diff) | |
| parent | a9785a4adb76afcafe9a4c750b3d2703d62b58b8 (diff) | |
| download | gitlab-ce-c39ee747dc34909882527bf48c1b9c1e4f9d528a.tar.gz | |
Merge branch 'calendar-activity-button-click' into 'master'
Fixed issue with calendar activity button not sending request correctly
When you click on a square it now sends the AJAX to the correct URL rather than the current URL. This was causing an issue where it would be loading the same page & inserting that into the DOM, rather than calendar activity events.
See merge request !4322
| -rw-r--r-- | app/assets/javascripts/calendar.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee index f9c7bffdadb..26a26061539 100644 --- a/app/assets/javascripts/calendar.js.coffee +++ b/app/assets/javascripts/calendar.js.coffee @@ -175,7 +175,7 @@ class @Calendar .range(['#acd5f2', '#254e77']) .domain([0, 3]) - clickDay: (stamp) -> + clickDay: (stamp) => if @currentSelectedDate isnt stamp.date @currentSelectedDate = stamp.date formatted_date = @currentSelectedDate.getFullYear() + "-" + (@currentSelectedDate.getMonth()+1) + "-" + @currentSelectedDate.getDate() |