openstack
/
horizon
Code Issues Proposed changes

Merge "Magic search shouldn't re-appear after selecting facet"

This commit is contained in:
Jenkins 2016-03-16 13:13:30 +00:00 committed by Gerrit Code Review
parent 4d0ce35ded 44f80bcc37
commit 9c87532fdd
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
horizon/static/framework/widgets/magic-search/magic-search.controller.js
View File

@ -125,7 +125,7 @@
ctrl.currentSearch.push(curr);
resetState();
emitQuery();
setMenuOpen(true);
setMenuOpen(false);
} else {
// if text search treat as search
ctrl.currentSearch = ctrl.currentSearch.filter(notTextSearch);
@ -263,7 +263,6 @@
ctrl.currentSearch.push(curr);
resetState();
emitQuery();
setMenuOpen(true);
}
function emitTextSearch(val) {

12
horizon/static/framework/widgets/magic-search/magic-search.controller.spec.js
View File

@ -278,11 +278,11 @@
ctrl.facetSelected = {name: 'waldo=undefined', label: ['a']};
});
it("sets menu open if facet is selected", function() {
ctrl.isMenuOpen = false;
it("hides menu if facet is selected", function() {
ctrl.isMenuOpen = true;
keyUpHandler(evt);
$timeout.flush();
expect(ctrl.isMenuOpen).toBe(true);
expect(ctrl.isMenuOpen).toBe(false);
});
it("sets menu closed if facet is not selected", function() {
@ -408,13 +408,13 @@
describe("optionClicked", function() {
it("opens the menu", function() {
ctrl.isMenuOpen = false;
it("closes the menu", function() {
ctrl.isMenuOpen = true;
ctrl.facetSelected = {name: 'waldo', label: []};
ctrl.filteredOptions = [{label: 'meow'}];
ctrl.optionClicked(0);
$timeout.flush();
expect(ctrl.isMenuOpen).toBe(true);
expect(ctrl.isMenuOpen).toBe(false);
});
it("resets state", function() {