diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-04 22:21:06 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-04 23:47:55 +0300 |
| commit | 1956bd5e9e44adcdf24ceaa45fddb7d02ba79b92 (patch) | |
| tree | dbc8302c1b60c2f4a44bffb56cab69e3ff972ff8 /app/assets/javascripts/milestone_select.js | |
| parent | a04378a5e7332efc05fba2d31d77c1e306533147 (diff) | |
| download | gitlab-ce-1956bd5e9e44adcdf24ceaa45fddb7d02ba79b92.tar.gz | |
Add position menu above ability to glDropdown.
Diffstat (limited to 'app/assets/javascripts/milestone_select.js')
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 906b6b321a8..26cc6eb0e96 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -7,7 +7,7 @@ this.currentProject = JSON.parse(currentProject); } $('.js-milestone-select').each(function(i, dropdown) { - var $block, $dropdown, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, collapsedSidebarLabelTemplate, defaultLabel, issuableId, issueUpdateURL, milestoneLinkNoneTemplate, milestoneLinkTemplate, milestonesUrl, projectId, selectedMilestone, showAny, showNo, showUpcoming, useId; + var $block, $dropdown, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, collapsedSidebarLabelTemplate, defaultLabel, issuableId, issueUpdateURL, milestoneLinkNoneTemplate, milestoneLinkTemplate, milestonesUrl, projectId, selectedMilestone, showAny, showNo, showUpcoming, useId, showMenuAbove; $dropdown = $(dropdown); projectId = $dropdown.data('project-id'); milestonesUrl = $dropdown.data('milestones'); @@ -15,6 +15,7 @@ selectedMilestone = $dropdown.data('selected'); showNo = $dropdown.data('show-no'); showAny = $dropdown.data('show-any'); + showMenuAbove = $dropdown.data('showMenuAbove'); showUpcoming = $dropdown.data('show-upcoming'); useId = $dropdown.data('use-id'); defaultLabel = $dropdown.data('default-label'); @@ -31,6 +32,7 @@ collapsedSidebarLabelTemplate = _.template('<span class="has-tooltip" data-container="body" title="<%- remaining %>" data-placement="left"> <%- title %> </span>'); } return $dropdown.glDropdown({ + showMenuAbove: showMenuAbove, data: function(term, callback) { return $.ajax({ url: milestonesUrl @@ -60,7 +62,11 @@ if (extraOptions.length) { extraOptions.push('divider'); } - return callback(extraOptions.concat(data)); + + callback(extraOptions.concat(data)); + if (showMenuAbove) { + $dropdown.data('glDropdown').positionMenuAbove(); + } }); }, filterable: true, |