diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-07-27 15:37:50 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-07-28 01:27:05 -0500 |
commit | c4718a5f2f443c78a78ad144098ee049d9f70128 (patch) | |
tree | 887a1bc11d83e143efafb61010f4b24d7c2b3dc7 | |
parent | 9d5bdb5d313f42197cfa8c57da314ea423e8d8a1 (diff) | |
download | gitlab-ce-c4718a5f2f443c78a78ad144098ee049d9f70128.tar.gz |
resolve consistent-return eslint violation
[ci-skip]
-rw-r--r-- | app/assets/javascripts/users/activity_calendar.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/users/activity_calendar.js b/app/assets/javascripts/users/activity_calendar.js index 79b31227b77..2efb10860d5 100644 --- a/app/assets/javascripts/users/activity_calendar.js +++ b/app/assets/javascripts/users/activity_calendar.js @@ -1,4 +1,4 @@ -/* eslint-disable no-var, vars-on-top, eqeqeq, newline-per-chained-call, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, no-unused-vars, no-else-return, max-len, class-methods-use-this */ +/* eslint-disable no-var, vars-on-top, eqeqeq, newline-per-chained-call, one-var, one-var-declaration-per-line, no-unused-vars, no-else-return, max-len, class-methods-use-this */ import d3 from 'd3'; @@ -94,10 +94,8 @@ export default class ActivityCalendar { if (lastMonth != null) { lastMonthX = lastMonth.x; } - if (lastMonth == null) { - return this.months.push({ month, x }); - } else if (month !== lastMonth.month && x - this.daySizeWithSpace !== lastMonthX) { - return this.months.push({ month, x }); + if (lastMonth == null || (month !== lastMonth.month && x - this.daySizeWithSpace !== lastMonthX)) { + this.months.push({ month, x }); } } }); |