FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #283 from rigrig/setting 

Some minor settings fixes
pull/287/head^2
Gordon Williams 2020-04-14 10:13:28 +01:00 committed by GitHub
parent 1d210d7b6b 1a69b2a3ac
commit 4946765f17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/setting/ChangeLog
View File

@ -12,4 +12,6 @@
0.12: Fix memory leak (#206)
Bring App settings nearer the top
Move LCD Timeout to wakeup menu
0.13: Move LCD Brightness menu into more general LCD menu
0.13: Fix memory leak for App settings
Make capitalization more consistent
Move LCD Brightness menu into more general LCD menu

6
apps/setting/settings.js
View File

@ -64,7 +64,7 @@ function showMainMenu() {
const mainmenu = {
'': { 'title': 'Settings' },
'Make Connectable': ()=>makeConnectable(),
'App/widget settings': ()=>showAppSettingsMenu(),
'App/Widget Settings': ()=>showAppSettingsMenu(),
'BLE': {
value: settings.ble,
format: boolFormat,
@ -81,7 +81,7 @@ function showMainMenu() {
updateSettings();
}
},
'Debug info': {
'Debug Info': {
value: settings.log,
format: v => v ? "Show" : "Hide",
onchange: () => {
@ -450,7 +450,7 @@ function showAppSettings(app) {
}
try {
// pass showAppSettingsMenu as "back" argument
appSettings(showAppSettingsMenu);
appSettings(()=>showAppSettingsMenu());
} catch (e) {
console.log(`${app.name} settings error:`, e)
return showError('Error in settings');