diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-08-24 15:51:33 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-08-24 15:51:33 +0100 |
| commit | 831fc817a62d66f4ac4eac8e8cc0b76d593e6448 (patch) | |
| tree | 2e1cd5e5e8f903cc9b1870e8702d730dfa98d70d | |
| parent | 02591b043052eb4f8041f8cf51546fab272d7b61 (diff) | |
| download | gitlab-ce-21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-list.tar.gz | |
Moved `.option-hidden` to exist only in `SELECTABLE_CLASSES` as `NON_SELECTABLE_CLASSES` is used to re-show previously hidden elements21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-list
| -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 |