diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-08-29 21:30:06 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-29 21:30:06 +0000 |
commit | b94f26ce1de75476aeb468ee594d71c026fa6761 (patch) | |
tree | 1ed2816689ff29069792375bdf9aecc7a781feb1 | |
parent | 35566fd9bbfaad9e1b472c77b9eca9f780389d7a (diff) | |
parent | 831fc817a62d66f4ac4eac8e8cc0b76d593e6448 (diff) | |
download | gitlab-ce-b94f26ce1de75476aeb468ee594d71c026fa6761.tar.gz |
Merge branch '21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-list' into 'master'
Fixed issue where filtering one dropdown will filter another on the page
## What does this MR do?
Moved `.option-hidden` to exist only in `SELECTABLE_CLASSES` as `NON_SELECTABLE_CLASSES` is used to re-show previously hidden elements.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
Closes #21285.
## Screenshots (if relevant)
![2016-08-24_15.59.16](/uploads/8282bd6507d10de61097956a57bd63cc/2016-08-24_15.59.16.gif)
## 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
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
Closes #21285
See merge request !5985
-rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 0179b320a3b..2daf1b77e13 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -117,7 +117,7 @@ } }); } else { - return elements.show(); + return elements.show().removeClass('option-hidden'); } } }; @@ -190,9 +190,9 @@ currentIndex = -1; - NON_SELECTABLE_CLASSES = '.divider, .separator, .dropdown-header, .dropdown-menu-empty-link, .option-hidden'; + NON_SELECTABLE_CLASSES = '.divider, .separator, .dropdown-header, .dropdown-menu-empty-link'; - SELECTABLE_CLASSES = ".dropdown-content li:not(" + NON_SELECTABLE_CLASSES + ")"; + SELECTABLE_CLASSES = ".dropdown-content li:not(" + NON_SELECTABLE_CLASSES + ", .option-hidden)"; CURSOR_SELECT_SCROLL_PADDING = 5 |