Skip to content

Commit 11f337f

Browse files
Use forEach as per espruino.com/Performance
1 parent f987a6a commit 11f337f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

apps/mtnclock/app.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ function draw(color) {
211211
//clock text
212212
(color.clock == undefined) ? g.setColor(0xFFFF) : g.setColor(color.clock);
213213
const start = 87;
214-
for (let r = 0; r < data.rows.length; r++) {
215-
let a = data.rows[r].menuA;
216-
let b = data.rows[r].menuB;
214+
data.rows.forEach(function(row, r) {
215+
let a = row.menuA;
216+
let b = row.menuB;
217217
if (clockinfos[a] && clockinfos[a].items[b]) {
218218
let ci = clockinfos[a].items[b];
219219
let text = ci.get().text;
@@ -225,7 +225,7 @@ function draw(color) {
225225
}
226226
g.setFont("Vector", py(10)).setFontAlign(-1, -1).drawString(text, px(2), py((start - (data.rows.length - 1) * 10) + r * 10));
227227
}
228-
}
228+
});
229229

230230
g.setFont("Vector", py(20)).setFontAlign(-1, -1).drawString((require("locale").time(new Date(), 1).replace(" ", "")), px(2), py(start - ((data.rows.length + 2)*10)));
231231
g.setFont("Vector", py(10)).drawString(require('locale').dow(new Date(), 1)+" "+new Date().getDate()+" "+require('locale').month(new Date(), 1)+((data.temp == undefined) ? "" : " | "+require('locale').temp(Math.round(data.temp-273.15)).replace(".0", "")), px(2), py(start - data.rows.length * 10));
@@ -409,17 +409,17 @@ function drawClkinfoSettings() {
409409
g.setFont("Vector", py(10)).setFontAlign(0, -1).drawString("+", px(83), py(9));
410410
g.drawRect(px(67), 1, px(100)-1, px(25)-1);
411411

412-
for (let r = 0; r < data.rows.length; r++) {
413-
let a = data.rows[r].menuA;
414-
let b = data.rows[r].menuB;
412+
data.rows.forEach(function(row, r) {
413+
let a = row.menuA;
414+
let b = row.menuB;
415415
let ci = clockinfos[a].items[b];
416416
if (clockinfosMain[a] && clockinfosMain[a][b]) {
417417
clockinfosMain[a][b] = false;
418418
ci.hide();
419419
ci.removeListener("redraw", clockinfoRedraw);
420420
}
421421
addClockinfo(r)
422-
}
422+
});
423423
clockinfosMain = {};
424424
}
425425

@@ -442,13 +442,13 @@ function addClockinfo(r) {
442442

443443
function saveClockinfos() {
444444
data.rows = [];
445-
for (let r = 0; r < clockinfosSettings.length; r++) {
445+
clockinfosSettings.forEach(function(row, r) {
446446
data.rows[r] = {
447-
menuA: clockinfosSettings[r].menuA,
448-
menuB: clockinfosSettings[r].menuB
447+
menuA: row.menuA,
448+
menuB: row.menuB
449449
}
450-
clockinfosSettings[r].remove();
451-
}
450+
row.remove();
451+
});
452452
require("Storage").writeJSON("mtnclock.json", data);
453453
}
454454

0 commit comments

Comments
 (0)