⏫ Forwardport of #11246 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/11246.patch (created by @crissanclick) based on commit(s): 1. 79f9c8a 2. 154dd01 3. c17b3eb Fixed GitHub Issues in 2.3-develop branch: - #11231: Can't close mobile search bar once typed (reported by @BenSpace48)
magento · Jan 23, 2018 · 9701bb7 · 9701bb7
1 parent 8e77e2f
commit 9701bb7
Showing 1 changed file with 42 additions and 38 deletions.
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js
@@ -286,46 +286,50 @@ define([
                 $.getJSON(this.options.url, {
                     q: value
                 }, $.proxy(function (data) {
-                    $.each(data, function (index, element) {
-                        var html;
-
-                        element.index = index;
-                        html = template({
-                            data: element
+                    if (data.length) {
+                        $.each(data, function (index, element) {
+                            var html;
+
+                            element.index = index;
+                            html = template({
+                                data: element
+                            });
+                            dropdown.append(html);
                         });
-                        dropdown.append(html);
-                    });
-                    this.responseList.indexList = this.autoComplete.html(dropdown)
-                        .css(clonePosition)
-                        .show()
-                        .find(this.options.responseFieldElements + ':visible');
-
-                    this._resetResponseList(false);
-                    this.element.removeAttr('aria-activedescendant');
-
-                    if (this.responseList.indexList.length) {
-                        this._updateAriaHasPopup(true);
-                    } else {
-                        this._updateAriaHasPopup(false);
-                    }
 
-                    this.responseList.indexList
-                        .on('click', function (e) {
-                            this.responseList.selected = $(e.currentTarget);
-                            this.searchForm.trigger('submit');
-                        }.bind(this))
-                        .on('mouseenter mouseleave', function (e) {
-                            this.responseList.indexList.removeClass(this.options.selectClass);
-                            $(e.target).addClass(this.options.selectClass);
-                            this.responseList.selected = $(e.target);
-                            this.element.attr('aria-activedescendant', $(e.target).attr('id'));
-                        }.bind(this))
-                        .on('mouseout', function (e) {
-                            if (!this._getLastElement() && this._getLastElement().hasClass(this.options.selectClass)) {
-                                $(e.target).removeClass(this.options.selectClass);
-                                this._resetResponseList(false);
-                            }
-                        }.bind(this));
+                        this.responseList.indexList = this.autoComplete.html(dropdown)
+                            .css(clonePosition)
+                            .show()
+                            .find(this.options.responseFieldElements + ':visible');
+
+                        this._resetResponseList(false);
+                        this.element.removeAttr('aria-activedescendant');
+
+                        if (this.responseList.indexList.length) {
+                            this._updateAriaHasPopup(true);
+                        } else {
+                            this._updateAriaHasPopup(false);
+                        }
+
+                        this.responseList.indexList
+                            .on('click', function (e) {
+                                this.responseList.selected = $(e.currentTarget);
+                                this.searchForm.trigger('submit');
+                            }.bind(this))
+                            .on('mouseenter mouseleave', function (e) {
+                                this.responseList.indexList.removeClass(this.options.selectClass);
+                                $(e.target).addClass(this.options.selectClass);
+                                this.responseList.selected = $(e.target);
+                                this.element.attr('aria-activedescendant', $(e.target).attr('id'));
+                            }.bind(this))
+                            .on('mouseout', function (e) {
+                                if (!this._getLastElement() &&
+                                    this._getLastElement().hasClass(this.options.selectClass)) {
+                                    $(e.target).removeClass(this.options.selectClass);
+                                    this._resetResponseList(false);
+                                }
+                            }.bind(this));
+                    }
                 }, this));
             } else {
                 this._resetResponseList(true);