diff options
author | Constance Okoghenun <cokoghenun@gitlab.com> | 2017-12-21 15:28:54 +0100 |
---|---|---|
committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2017-12-21 15:28:54 +0100 |
commit | 3b8286b1d1ccfac835a889975a953695f72f5991 (patch) | |
tree | 0e838941e3dc621fa2bf69a8ee69696c78820c64 | |
parent | cf78e8e27e6179fd45cf447b6d357cfa208c9608 (diff) | |
download | gitlab-ce-3b8286b1d1ccfac835a889975a953695f72f5991.tar.gz |
Fixed broken lint rules in milestone_select.js
-rw-r--r-- | app/assets/javascripts/milestone_select.js | 94 |
1 files changed, 44 insertions, 50 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 3dd51c26120..b6af3f86d67 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -52,51 +52,49 @@ export default class MilestoneSelect { } return $dropdown.glDropdown({ showMenuAbove: showMenuAbove, - data: (term, callback) => { - return $.ajax({ - url: milestonesUrl - }).done((data) => { - const extraOptions = []; - if (showAny) { - extraOptions.push({ - id: 0, - name: '', - title: 'Any Milestone' - }); - } - if (showNo) { - extraOptions.push({ - id: -1, - name: 'No Milestone', - title: 'No Milestone' - }); - } - if (showUpcoming) { - extraOptions.push({ - id: -2, - name: '#upcoming', - title: 'Upcoming' - }); - } - if (showStarted) { - extraOptions.push({ - id: -3, - name: '#started', - title: 'Started' - }); - } - if (extraOptions.length) { - extraOptions.push('divider'); - } + data: (term, callback) => $.ajax({ + url: milestonesUrl + }).done((data) => { + const extraOptions = []; + if (showAny) { + extraOptions.push({ + id: 0, + name: '', + title: 'Any Milestone' + }); + } + if (showNo) { + extraOptions.push({ + id: -1, + name: 'No Milestone', + title: 'No Milestone' + }); + } + if (showUpcoming) { + extraOptions.push({ + id: -2, + name: '#upcoming', + title: 'Upcoming' + }); + } + if (showStarted) { + extraOptions.push({ + id: -3, + name: '#started', + title: 'Started' + }); + } + if (extraOptions.length) { + extraOptions.push('divider'); + } - callback(extraOptions.concat(data)); - if (showMenuAbove) { - $dropdown.data('glDropdown').positionMenuAbove(); - } - $(`[data-milestone-id="${selectedMilestone}"] > a`).addClass('is-active'); - }); - }, - renderRow: (milestone) => ` + callback(extraOptions.concat(data)); + if (showMenuAbove) { + $dropdown.data('glDropdown').positionMenuAbove(); + } + $(`[data-milestone-id="${selectedMilestone}"] > a`).addClass('is-active'); + }), + renderRow: milestone => ` <li data-milestone-id="${milestone.name}"> <a href='#' class='dropdown-menu-milestone-link'> ${_.escape(milestone.title)} @@ -117,9 +115,7 @@ export default class MilestoneSelect { }, defaultLabel: defaultLabel, fieldName: $dropdown.data('field-name'), - text: (milestone) => { - return _.escape(milestone.title); - }, + text: milestone => _.escape(milestone.title), id: (milestone) => { if (!useId && !$dropdown.is('.js-issuable-form-dropdown')) { return milestone.name; @@ -127,9 +123,7 @@ export default class MilestoneSelect { return milestone.id; } }, - isSelected: (milestone) => { - return milestone.name === selectedMilestone; - }, + isSelected: milestone => milestone.name === selectedMilestone, hidden: () => { $selectBox.hide(); // display:block overrides the hide-collapse rule |