Skip to content

Commit d896af2

Browse files
author
Erwin Dondorp
committed
show indicator for keyboard shortcut, in wide/narrow menu
1 parent 282d725 commit d896af2

1 file changed

Lines changed: 14 additions & 8 deletions

File tree

saltgui/static/scripts/Router.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,24 +105,30 @@ export class Router {
105105
dropdownContent = Utils.createDiv("dropdown-content", "", "dropdown-content-" + pParentId);
106106
dropDownDiv.append(dropdownContent);
107107
}
108-
const itemDiv = Utils.createDiv("run-command-button menu-item menu-item-first-letter", pButtonId, "button-" + pButtonId + "1");
108+
const itemDiv = Utils.createDiv("run-command-button menu-item", pButtonId, "button-" + pButtonId + "1");
109+
if (pKey) {
110+
// currently applies to all, but just in case
111+
itemDiv.classList.add("menu-item-first-letter");
112+
}
109113
dropdownContent.append(itemDiv);
110114
} else {
111-
const topItemDiv = Utils.createDiv("menu-item menu-item-first-letter", pButtonId, "button-" + pButtonId + "1");
115+
const topItemDiv = Utils.createDiv("menu-item", pButtonId, "button-" + pButtonId + "1");
112116
dropDownDiv.append(topItemDiv);
117+
if (pKey) {
118+
topItemDiv.classList.add("menu-item-first-letter");
119+
}
113120
}
114121

115122
// mini menu
116123

117124
const miniMenuDiv = document.querySelector(".minimenu");
118125
const dropdownContent2 = miniMenuDiv.querySelector(".dropdown-content");
119-
let menuItemDiv;
126+
const menuItemDiv = Utils.createDiv("run-command-button menu-item", pButtonId, "button-" + pButtonId + "2");
120127
if (pParentId) {
121-
menuItemDiv = Utils.createDiv("run-command-button menu-item");
122-
menuItemDiv.append(Utils.createSpan("", "-" + Character.NO_BREAK_SPACE, ""));
123-
menuItemDiv.append(Utils.createSpan("menu-item-first-letter", pButtonId, "button-" + pButtonId + "2"));
124-
} else {
125-
menuItemDiv = Utils.createDiv("run-command-button menu-item menu-item-first-letter", pButtonId, "button-" + pButtonId + "2");
128+
menuItemDiv.style.paddingLeft = "50px";
129+
}
130+
if (pKey) {
131+
menuItemDiv.classList.add("menu-item-first-letter");
126132
}
127133
dropdownContent2.append(menuItemDiv);
128134

0 commit comments

Comments
 (0)