Merge pull request espruino#3828 from bobrippling/fix/b1-settings-scroll

thyttan · web-flow · commit 2123a468199c · 2025-04-26T18:04:39.000+02:00
settings: handle a `undefined` scroller (BJS1)
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
@@ -86,3 +86,4 @@ of 'Select Clock'
 0.75: Restore previous menu's scroll positions
 0.76: Add altitude calibration menu (and update README after menu changed)
 0.77: Save altitude calibration when user exits via reset
+0.78: Fix menu scroll restore on BangleJS1
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.77",
+  "version": "0.78",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
@@ -27,7 +27,8 @@ function pushMenu(menu) {
 function restoreMenu(menu) {
   // equivalent to pushMenu(null); popMenu(menu);
   if(!menu[""]) menu[""] = {};
-  menu[""].scroll = menuScroller.scroll;
+  if(menuScroller) // may be undefined on BangleJS1
+    menu[""].scroll = menuScroller.scroll;
   menuScroller = E.showMenu(menu).scroller;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "setting",`
`3`	`3`	`"name": "Settings",`
`4`		`- "version": "0.77",`
	`4`	`+ "version": "0.78",`
`5`	`5`	`"description": "A menu for setting up Bangle.js",`
`6`	`6`	`"icon": "settings.png",`
`7`	`7`	`"tags": "tool,system",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ function pushMenu(menu) {`
`27`	`27`	`function restoreMenu(menu) {`
`28`	`28`	`// equivalent to pushMenu(null); popMenu(menu);`
`29`	`29`	`if(!menu[""]) menu[""] = {};`
`30`		`- menu[""].scroll = menuScroller.scroll;`
	`30`	`+ if(menuScroller) // may be undefined on BangleJS1`
	`31`	`+ menu[""].scroll = menuScroller.scroll;`
`31`	`32`	`menuScroller = E.showMenu(menu).scroller;`
`32`	`33`	`}`
`33`	`34`