Skip to content

Commit f1c03e4

Browse files
committed
promenu: rename settings (avoid clobbering short variables)
... since `S` is used a lot in the IDE
1 parent 0e06ccf commit f1c03e4

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

apps/promenu/bootb2.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var _a, _b;
2-
var S = (require("Storage").readJSON("promenu.settings.json", true) || {});
3-
(_a = S.naturalScroll) !== null && _a !== void 0 ? _a : (S.naturalScroll = false);
4-
(_b = S.wrapAround) !== null && _b !== void 0 ? _b : (S.wrapAround = true);
2+
var prosettings = (require("Storage").readJSON("promenu.settings.json", true) || {});
3+
(_a = prosettings.naturalScroll) !== null && _a !== void 0 ? _a : (prosettings.naturalScroll = false);
4+
(_b = prosettings.wrapAround) !== null && _b !== void 0 ? _b : (prosettings.wrapAround = true);
55
E.showMenu = function (items) {
66
var RectRnd = function (x1, y1, x2, y2, r) {
77
var pp = [];
@@ -168,7 +168,7 @@ E.showMenu = function (items) {
168168
}
169169
else {
170170
var lastSelected = selected;
171-
if (S.wrapAround) {
171+
if (prosettings.wrapAround) {
172172
selected = (selected + dir + menuItems.length) % menuItems.length;
173173
}
174174
else {
@@ -210,7 +210,7 @@ E.showMenu = function (items) {
210210
},
211211
}, function (dir) {
212212
if (dir)
213-
l.move(S.naturalScroll ? -dir : dir);
213+
l.move(prosettings.naturalScroll ? -dir : dir);
214214
else
215215
l.select();
216216
});

apps/promenu/bootb2.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ const enum Consts {
99
NAME_SCROLL_PAD = 5,
1010
}
1111

12-
const S = (require("Storage").readJSON("promenu.settings.json", true) || {}) as PromenuSettings;
13-
S.naturalScroll ??= false;
14-
S.wrapAround ??= true;
12+
const prosettings = (require("Storage").readJSON("promenu.settings.json", true) || {}) as PromenuSettings;
13+
prosettings.naturalScroll ??= false;
14+
prosettings.wrapAround ??= true;
1515

1616
E.showMenu = (items?: Menu): MenuInstance => {
1717
const RectRnd = (x1: number, y1: number, x2: number, y2: number, r: number) => {
@@ -216,7 +216,7 @@ E.showMenu = (items?: Menu): MenuInstance => {
216216

217217
} else {
218218
const lastSelected = selected;
219-
if (S.wrapAround) {
219+
if (prosettings.wrapAround) {
220220
selected = (selected + dir + /*keep +ve*/menuItems.length) % menuItems.length;
221221
} else {
222222
selected = E.clip(selected + dir, 0, menuItems.length - 1);
@@ -257,7 +257,7 @@ E.showMenu = (items?: Menu): MenuInstance => {
257257
},
258258
} as SetUIArg<"updown">,
259259
dir => {
260-
if (dir) l.move(S.naturalScroll ? -dir : dir);
260+
if (dir) l.move(prosettings.naturalScroll ? -dir : dir);
261261
else l.select();
262262
});
263263

0 commit comments

Comments
 (0)