Fix dropdown filter input value after blur
This commit is contained in:
parent
6c1190623f
commit
f0ed80a234
4 changed files with 25 additions and 2 deletions
|
@ -892,7 +892,7 @@ DEPENDENCIES
|
|||
gemojione (~> 3.0)
|
||||
github-linguist (~> 4.7.0)
|
||||
gitlab-flowdock-git-hook (~> 1.0.1)
|
||||
gitlab-markup (~> 1.5.0)
|
||||
gitlab-markup (~> 1.5.1)
|
||||
gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
|
||||
gitlab_omniauth-ldap (~> 1.2.1)
|
||||
gollum-lib (~> 4.2)
|
||||
|
|
|
@ -476,7 +476,7 @@
|
|||
this.removeArrayKeyEvent();
|
||||
$input = this.dropdown.find(".dropdown-input-field");
|
||||
if (this.options.filterable) {
|
||||
$input.blur().val("");
|
||||
$input.blur();
|
||||
}
|
||||
if (this.dropdown.find(".dropdown-toggle-page").length) {
|
||||
$('.dropdown-menu', this.dropdown).removeClass(PAGE_TWO_CLASS);
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix search group/project filtering to show results
|
||||
merge_request:
|
||||
author:
|
|
@ -50,6 +50,9 @@
|
|||
selectable: true,
|
||||
filterable: isFilterable,
|
||||
data: hasRemote ? remoteMock.bind({}, this.projectsData) : this.projectsData,
|
||||
search: {
|
||||
fields: ['name']
|
||||
},
|
||||
text: (project) => {
|
||||
(project.name_with_namespace || project.name);
|
||||
},
|
||||
|
@ -167,5 +170,21 @@
|
|||
expect($(document.activeElement)).toEqual($(SEARCH_INPUT_SELECTOR));
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
it('should still have input value on close and restore', () => {
|
||||
let $searchInput = $(SEARCH_INPUT_SELECTOR);
|
||||
initDropDown.call(this, false, true);
|
||||
$searchInput
|
||||
.trigger('focus')
|
||||
.val('g')
|
||||
.trigger('input');
|
||||
expect($searchInput.val()).toEqual('g');
|
||||
this.dropdownButtonElement.trigger('hidden.bs.dropdown');
|
||||
$searchInput
|
||||
.trigger('blur')
|
||||
.trigger('focus');
|
||||
expect($searchInput.val()).toEqual('g');
|
||||
});
|
||||
});
|
||||
})();
|
||||
|
|
Loading…
Reference in a new issue