From 7ff6af19cc2d0f300a184de3887e4e5163bc9a00 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 23 Mar 2016 16:44:09 +0000
Subject: Dropdown bug fixes Added back upcoming to milestone filter Fixed bug
 that would cause the currently selected value to disappear on filters Fixed
 bug that throw an error when filtering by upcoming when there is only a
 milestone in the past

---
 app/assets/javascripts/gl_dropdown.js.coffee | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'app/assets/javascripts/gl_dropdown.js.coffee')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 2b56ab2e6de..b03a95a80e8 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -145,11 +145,10 @@ class GitLabDropdown
         selector = ".dropdown-page-one .dropdown-content a"
 
       @dropdown.on "click", selector, (e) ->
-        e.preventDefault()
-        self.rowClicked $(@)
+        selected = self.rowClicked $(@)
 
         if self.options.clicked
-          self.options.clicked.call(@,e)
+          self.options.clicked(selected)
 
   toggleLoading: ->
     $('.dropdown-menu', @dropdown).toggleClass LOADING_CLASS
@@ -288,6 +287,10 @@ class GitLabDropdown
     if el.hasClass(ACTIVE_CLASS)
       el.removeClass(ACTIVE_CLASS)
       field.remove()
+
+      # Toggle the dropdown label
+      if @options.toggleLabel
+        $(@el).find(".dropdown-toggle-text").text @options.toggleLabel
     else
       fieldName = @options.fieldName
       selectedIndex = el.parent().index()
@@ -304,7 +307,7 @@ class GitLabDropdown
         @dropdown.parent().find("input[name='#{fieldName}']").remove()
 
       # Toggle active class for the tick mark
-      el.toggleClass "is-active"
+      el.addClass ACTIVE_CLASS
 
       # Toggle the dropdown label
       if @options.toggleLabel
@@ -313,11 +316,15 @@ class GitLabDropdown
         if !field.length
           # Create hidden input for form
           input = "<input type='hidden' name='#{fieldName}' value='#{value}' />"
-          if @options.inputId?  
+          if @options.inputId?
             input = $(input)
                       .attr('id', @options.inputId)
           @dropdown.before input
 
+        @dropdown.parent().find("input[name='#{fieldName}']").val value
+
+      return selectedObject
+
   selectFirstRow: ->
     selector = '.dropdown-content li:first-child a'
     if @dropdown.find(".dropdown-toggle-page").length
-- 
cgit v1.2.3