Merge remote-tracking branch 'origin/MAGETWO-92133' into 2.3-develop-pr22

Author: StasKozar

app/code/Magento/Backend/Block/GlobalSearch.php

@@ -31,6 +31,7 @@ public function getWidgetInitOptions()
                 'filterProperty' => 'name',
                 'preventClickPropagation' => false,
                 'minLength' => 2,
+                'submitInputOnEnter' => false,
             ]
         ];
     }

app/code/Magento/Search/Model/SynonymAnalyzer.php

@@ -83,7 +83,7 @@ public function getSynonymsForPhrase($phrase)
     /**
      * Helper method to find the matching of $pattern to $synonymGroupsToExamine.
      * If matches, the particular array index is returned.
-     * Otherwise false will be returned.
+     * Otherwise null will be returned.
      *
      * @param string $pattern
      * @param array $synonymGroupsToExamine
@@ -99,6 +99,7 @@ private function findInArray(string $pattern, array $synonymGroupsToExamine)
             }
             $position++;
         }
+
         return null;
     }
 

lib/web/mage/backend/suggest.js

@@ -65,7 +65,8 @@
             inputWrapper: '<div class="mage-suggest"><div class="mage-suggest-inner"></div></div>',
             dropdownWrapper: '<div class="mage-suggest-dropdown"></div>',
             preventClickPropagation: true,
-            currentlySelected: null
+            currentlySelected: null,
+            submitInputOnEnter: true
         },
 
         /**
@@ -79,7 +80,6 @@
                 label: ''
             };
             this.templates = {};
-
             this._renderedContext = null;
             this._selectedItem = this._nonSelectedItem;
             this._control = this.options.controls || {};
@@ -312,18 +312,23 @@
                 click: this.search
             }, this.options.events));
 
+            this._bindSubmit();
             this._bindDropdown();
         },
 
         /**
-         * @param {Object} event - event object
+         * @param {Object} event
          * @private
          */
         _toggleEnter: function (event) {
             var suggestList,
                 activeItems,
                 selectedItem;
 
+            if (!this.options.submitInputOnEnter) {
+                event.preventDefault();
+            }
+
             suggestList = $(event.currentTarget.parentNode).find('ul').first();
             activeItems = suggestList.find('._active');
 
@@ -333,12 +338,22 @@
                 if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) {
                     window.location = selectedItem.find('a').attr('href');
                     event.preventDefault();
-
-                    return false;
                 }
             }
         },
 
+        /**
+         * Bind handlers for submit on enter
+         * @private
+         */
+        _bindSubmit: function () {
+            this.element.parents('form').on('submit', function (event) {
+                if (!this.submitInputOnEnter) {
+                    event.preventDefault();
+                }
+            });
+        },
+
         /**
          * @param {Object} e - event object
          * @private
@@ -465,8 +480,8 @@
             }
 
             if (this._trigger('beforeselect', e || null, {
-                item: this._focused
-            }) === false) {
+                    item: this._focused
+                }) === false) {
                 return;
             }
             this._selectItem(e);
@@ -701,9 +716,6 @@
             if ($.isArray(o.source)) {
                 response(this.filter(o.source, term));
             } else if ($.type(o.source) === 'string') {
-                if (this._xhr) {
-                    this._xhr.abort();
-                }
                 ajaxData = {};
                 ajaxData[this.options.termAjaxArgument] = term;
 
@@ -729,10 +741,6 @@
         _abortSearch: function () {
             this.element.removeClass(this.options.loadingClass);
             clearTimeout(this._searchTimeout);
-
-            if (this._xhr) {
-                this._xhr.abort();
-            }
         },
 
         /**
@@ -905,8 +913,8 @@
                 '<li class="mage-suggest-search-field" data-role="parent-choice-element"><' +
                 'label class="mage-suggest-search-label"></label></li></ul>',
             choiceTemplate: '<li class="mage-suggest-choice button"><div><%- text %></div>' +
-                '<span class="mage-suggest-choice-close" tabindex="-1" ' +
-                'data-mage-init=\'{"actionLink":{"event":"removeOption"}}\'></span></li>',
+            '<span class="mage-suggest-choice-close" tabindex="-1" ' +
+            'data-mage-init=\'{"actionLink":{"event":"removeOption"}}\'></span></li>',
             selectedClass: 'mage-suggest-selected'
         },