summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-28 20:02:52 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-28 20:02:52 +0000
commitbcebdee751a76e858afd91ae256c7e6388ec8a7e (patch)
tree5f16761963b96e6715c31b2208fa7ed159179377
parent3b33cbb21146fe41582fa33a8e6d0d0f709b8478 (diff)
parent0b33f90b8c2bdaf6c7a963dd01a0b47b0cd5f532 (diff)
downloadgitlab-ce-bcebdee751a76e858afd91ae256c7e6388ec8a7e.tar.gz
Merge branch '18942-dropdowns-should-apply-any-present-filter-once-data-is-loaded' into 'master'
Fixed dropdown not filtering queries entered before data is loaded ## What does this MR do? Triggers a 'keyup' event on a filters input to force it to process any text that was added before the data was retrieved and rendered. ## Are there points in the code the reviewer needs to double check? :confused: ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18942. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4846
-rw-r--r--app/assets/javascripts/gl_dropdown.js.coffee2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 703128fecb3..1b0d9f0b1ae 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -186,6 +186,8 @@ class GitLabDropdown
@fullData = data
@parseData @fullData
+
+ @filter.input.trigger('keyup') if @options.filterable and @filter and @filter.input
}
# Init filterable