diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-19 13:15:54 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-19 13:15:54 +0000 |
| commit | 2011f02b5dc718b39ee7b3de7db4cea2fffafd36 (patch) | |
| tree | 5befd28e249b87425dc51fa53ddac22bbc747a79 | |
| parent | bfa16dbcfba2a3233209f6403a0074d42e664df6 (diff) | |
| parent | d1b2e7b440e03e9ad5cac72fe767b16bf11d05cc (diff) | |
| download | gitlab-ce-2011f02b5dc718b39ee7b3de7db4cea2fffafd36.tar.gz | |
Merge branch 'dropdown-filter-after-load' into 'master'
Trigger filtering after ajax is complete in dropdown
Closes #15186
See merge request !3813
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 3 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index fac928ef202..641141072f4 100644 --- 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 diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 08bfd93f4e6..55d7a38cce2 100644 --- 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 |