Skip to content

Commit 9258016

Browse files
committed
Merge branch 'MAGETWO-11129' into PR-bugs
2 parents acb837d + 6f15770 commit 9258016

File tree

4 files changed

+225
-155
lines changed

4 files changed

+225
-155
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
display: block;
9696
font-size: @font-size__s;
9797
padding: @search-global-input__padding-top @search-global-input__padding-side @search-global-input__padding-bottom;
98+
&._active {
99+
background-color: @color-blue-clear-sky;
100+
}
98101
}
99102
.title {
100103
display: block;

lib/web/css/source/lib/_navigation.less

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@
329329
margin: 0 !important;
330330
position: absolute;
331331
left: 0;
332-
top: 100%;
333332
z-index: 1;
334333
.css(background, @_submenu-background-color);
335334
.css(border, @_submenu-border-width @_submenu-border-style @_submenu-border-color);
@@ -370,6 +369,11 @@
370369
top: 0 !important;
371370
left: 100% !important;
372371
}
372+
.submenu-reverse{
373+
bottom: 0 !important;
374+
left: auto !important;
375+
right: 100%;
376+
}
373377
}
374378
&.more {
375379
position: relative;

lib/web/mage/backend/suggest.js

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,47 @@
178178
_bind: function () {
179179
this._on($.extend({
180180
keydown: function (event) {
181-
var keyCode = $.ui.keyCode;
181+
var keyCode = $.ui.keyCode,
182+
suggestList,
183+
hasSuggestedItems,
184+
hasSelectedItems,
185+
selectedItem;
186+
182187
switch (event.keyCode) {
183188
case keyCode.PAGE_UP:
184-
case keyCode.PAGE_DOWN:
185189
case keyCode.UP:
190+
if (!event.shiftKey) {
191+
event.preventDefault();
192+
this._proxyEvents(event);
193+
}
194+
195+
suggestList = event.currentTarget.parentNode.getElementsByTagName('ul')[0];
196+
hasSuggestedItems = event.currentTarget.parentNode.getElementsByTagName('ul')[0].children.length >= 0;
197+
if (hasSuggestedItems) {
198+
selectedItem = $(suggestList.getElementsByClassName('_active')[0]).removeClass('_active').prev().addClass('_active');
199+
event.currentTarget.value = selectedItem.find("a").text();
200+
}
201+
202+
break;
203+
case keyCode.PAGE_DOWN:
186204
case keyCode.DOWN:
187205
if (!event.shiftKey) {
188206
event.preventDefault();
189207
this._proxyEvents(event);
190208
}
209+
210+
suggestList = event.currentTarget.parentNode.getElementsByTagName('ul')[0];
211+
hasSuggestedItems = event.currentTarget.parentNode.getElementsByTagName('ul')[0].children.length >= 0;
212+
if(hasSuggestedItems){
213+
hasSelectedItems = suggestList.getElementsByClassName('_active').length === 0;
214+
if(hasSelectedItems) {
215+
selectedItem = $(suggestList.children[0]).addClass('_active');
216+
event.currentTarget.value = selectedItem.find("a").text();
217+
}else {
218+
selectedItem = $(suggestList.getElementsByClassName('_active')[0]).removeClass('_active').next().addClass('_active');
219+
event.currentTarget.value = selectedItem.find("a").text();
220+
}
221+
}
191222
break;
192223
case keyCode.TAB:
193224
if (this.isDropdownShown()) {
@@ -197,6 +228,7 @@
197228
break;
198229
case keyCode.ENTER:
199230
case keyCode.NUMPAD_ENTER:
231+
200232
if (this.isDropdownShown() && this._focused) {
201233
this._proxyEvents(event);
202234
event.preventDefault();

0 commit comments

Comments
 (0)