Merge branch 'dropdown-filter-after-load' into 'master'

Trigger filtering after ajax is complete in dropdown ![filter](/uploads/1c361d968769eb3fe5cdd05dee497aa6/filter.gif) Closes #15186 See merge request !3813

Merge branch 'dropdown-filter-after-load' into 'master'
2011f02b · Jacob Schatz · bfa16dbc · d1b2e7b4 · 2011f02b · 2011f02b
Commit 2011f02b authored Apr 19, 2016 by Jacob Schatz
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

gl_dropdown.js.coffee app/assets/javascripts/gl_dropdown.js.coffee +3 -0

_sidebar.html.haml app/views/shared/issuable/_sidebar.html.haml +1 -0

No files found.
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -154,6 +154,9 @@ class GitLabDropdown
            @fullData = data

            @parseData @fullData
+
+            if @options.filterable
+              @filterInput.trigger 'keyup'
        }

    # Init filterable

--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -118,6 +118,7 @@
                              Manage labels
                            - else
                              View labels
+                  = dropdown_loading

      = render "shared/issuable/participants", participants: issuable.participants(current_user)
      - if current_user