MAGETWO-64077: Merge branch 'search-return-focus-after-closing-autocomplete' of github.com:evktalo/magento2 into MAGETWO-64077

ishakhsuvarov · ishakhsuvarov · commit 613fae88ad8f · 2017-02-02T11:54:06.000+02:00
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js
@@ -86,6 +86,8 @@ define([
                 setTimeout($.proxy(function () {
                     if (this.autoComplete.is(':hidden')) {
                         this.setActiveState(false);
+                    } else {
+                        this.element.trigger('focus');
                     }
                     this.autoComplete.hide();
                     this._updateAriaHasPopup(false);

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,8 @@ define([`
`86`	`86`	`setTimeout($.proxy(function () {`
`87`	`87`	`if (this.autoComplete.is(':hidden')) {`
`88`	`88`	`this.setActiveState(false);`
	`89`	`+ } else {`
	`90`	`+ this.element.trigger('focus');`
`89`	`91`	`}`
`90`	`92`	`this.autoComplete.hide();`
`91`	`93`	`this._updateAriaHasPopup(false);`