Skip to content

Commit 00afa44

Browse files
committed
Fixing keyboard submit of adminhtml suggest form.
1 parent eefdc1c commit 00afa44

File tree

1 file changed

+25
-14
lines changed

1 file changed

+25
-14
lines changed

Diff for: lib/web/mage/backend/suggest.js

+25-14
Original file line numberDiff line numberDiff line change
@@ -245,20 +245,7 @@
245245

246246
case keyCode.ENTER:
247247
case keyCode.NUMPAD_ENTER:
248-
suggestList = event.currentTarget.parentNode.getElementsByTagName('ul')[0];
249-
hasSelectedItems = suggestList.getElementsByClassName('_active').length >= 0;
250-
251-
if (hasSelectedItems) {
252-
selectedItem = $(suggestList.getElementsByClassName('_active')[0]);
253-
/* eslint-disable max-depth */
254-
if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) {
255-
window.location = selectedItem.find('a').attr('href');
256-
event.preventDefault();
257-
258-
return false;
259-
}
260-
/* eslint-enable max-depth */
261-
}
248+
this._toggleEnter(event);
262249

263250
if (this.isDropdownShown() && this._focused) {
264251
this._proxyEvents(event);
@@ -328,6 +315,30 @@
328315
this._bindDropdown();
329316
},
330317

318+
/**
319+
* @param {Object} event - event object
320+
* @private
321+
*/
322+
_toggleEnter: function (event) {
323+
var suggestList,
324+
activeItems,
325+
selectedItem;
326+
327+
suggestList = $(event.currentTarget.parentNode).find('ul').first();
328+
activeItems = suggestList.find('._active');
329+
330+
if (activeItems.length >= 0) {
331+
selectedItem = activeItems.first();
332+
333+
if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) {
334+
window.location = selectedItem.find('a').attr('href');
335+
event.preventDefault();
336+
337+
return false;
338+
}
339+
}
340+
},
341+
331342
/**
332343
* @param {Object} e - event object
333344
* @private

0 commit comments

Comments
 (0)