Merge pull request #3627 from thyttan/master

chore: rm semicolons at end of clkinfo + settings

apps/a_dndtoggle/settings.js

@@ -29,5 +29,4 @@
     }
   
     E.showMenu(buildMainMenu());
-  });
-  
+  })

apps/activepedom/settings.js

@@ -109,4 +109,4 @@
     },
   };
   E.showMenu(menu);
-});
+})

apps/agpsdata/settings.js

@@ -68,4 +68,4 @@ function buildMainMenu() {
 }
 
 E.showMenu(buildMainMenu());
-});
+})

apps/alarm/settings.js

@@ -48,4 +48,4 @@
   };
 
   E.showMenu(appMenu);
-});
+})

apps/andark/settings.js

@@ -25,4 +25,4 @@
   };
 
   E.showMenu(appMenu);
-});
+})

apps/antonclkplus/settings.js

@@ -94,4 +94,4 @@
 
   E.showMenu(mainmenu);
 
-});
+})

apps/banglexercise/settings.js

@@ -17,4 +17,4 @@
       }
     }
   });
-});
+})

apps/barclock/settings.js

@@ -32,4 +32,4 @@
   }
   require("ClockFace_menu").addItems(menu, save, items);
   E.showMenu(menu);
-});
+})

apps/berlinc/settings.js

@@ -23,4 +23,4 @@
   };
   E.showMenu(mainmenu);
 
-});
+})

apps/bikespeedo/settings.js

@@ -68,4 +68,4 @@
 
   E.showMenu(appMenu);
 
-});
+})

apps/blc/blc.settings.js

@@ -69,4 +69,4 @@
     //};
     
     E.showMenu(mainmenu);
-});
+})

apps/blecsc/clkinfo.js

@@ -70,5 +70,3 @@
   };
   return ci;
 })
-
-

apps/boxclk/settings.js

@@ -91,4 +91,4 @@
   });
 
   E.showMenu(menu);
-});
+})

apps/bthrm/settings.js

@@ -371,4 +371,4 @@
   };
 
   E.showMenu(buildMainMenu());
-});
+})

apps/carcrazy/settings.js

@@ -17,4 +17,4 @@
     }
   };
   E.showMenu(menu);
-});
+})

apps/chimer/settings.js

@@ -91,4 +91,4 @@
 
   settings = readSettings();
   showMainMenu();
-});
+})

apps/circlesclock/settings.js

@@ -92,4 +92,4 @@
   }
 
   showMainMenu();
-});
+})

apps/clicompleteclk/settings.js

@@ -47,4 +47,4 @@
     },
     '< Back': back,
   });
-});
+})

apps/clkinfocal/settings.js

@@ -34,4 +34,4 @@
     }
   });
 
-});
+})

apps/clkinfogps/clkinfo.js

@@ -124,4 +124,4 @@
   };
 
   return info;
-});
+})

apps/clkinfom/clkinfo.js

@@ -58,4 +58,4 @@
   };
 
   return info;
-});
+})

apps/clkinfostopw/clkinfo.js

@@ -74,4 +74,4 @@
             }
         ]
     };
-});
+})

apps/clkinfostopw/clkinfo.ts

@@ -80,4 +80,4 @@
       }
     ]
   };
-}) satisfies ClockInfoFunc
+}) satisfies ClockInfoFunc // FIXME: semi-colon added automatically when Typescript generates Javascript file?

apps/clockcal/settings.js

@@ -114,4 +114,4 @@
     };
     // Show the menu
     E.showMenu(menu);
-});
+})

apps/cogclock/settings.js

@@ -7,4 +7,4 @@
     "showDate", "hideWidgets"
   ]);
   E.showMenu(menu);
-});
+})

apps/counter2/settings.js

@@ -52,4 +52,4 @@
     };
     // Show the menu
     E.showMenu(menu);
-});
+})

apps/cprassist/settings.js

@@ -61,4 +61,4 @@
     }
   };
   E.showMenu(menu);
-});
+})

apps/daisy/settings.js

@@ -56,4 +56,3 @@
     }
   });
 })
-

apps/dane_tcr/settings.js

@@ -54,4 +54,4 @@
     },
     '< Back': back
   });
-});
+})

apps/dragboard/settings.js

@@ -45,4 +45,4 @@
   };
 
   E.showMenu(appMenu);
-});
+})

apps/draguboard/settings.js

@@ -41,4 +41,4 @@
   };
 
   E.showMenu(appMenu);
-});
+})

apps/drained/settings.js

@@ -87,4 +87,4 @@
         });
     };
     updateAndRedraw();
-});
+})

apps/drinkcounter/settings.js

@@ -55,4 +55,4 @@
 
   E.showMenu(mainmenu);
 
-});
+})

apps/dtlaunch/settings-b2.js

@@ -65,4 +65,4 @@
       }
     },
   });
-});
+})

apps/ffcniftyb/settings.js

@@ -28,4 +28,4 @@
   });
 
   E.showMenu(menu);
-});
+})

apps/folderlaunch/settings.js

@@ -248,4 +248,4 @@
         });
     };
     showMainMenu();
-});
+})

apps/gassist/settings.js

@@ -29,4 +29,4 @@
   }
   // Initially show the menu
   showMenu();
-});
+})

apps/gbmusic/settings.js

@@ -38,4 +38,4 @@
   };
 
   E.showMenu(menu);
-});
+})

apps/getup/settings.js

@@ -45,4 +45,4 @@
     },
   };
   E.showMenu(menu);
-});
+})

apps/gipy/settings.js

@@ -99,4 +99,4 @@
             }
         }
     });
-});
+})

apps/gpsrec/settings.js

@@ -1,4 +1,4 @@
 (function(back) {
-  // just go right to our app - we need all the memory
+  // just go right to our app - we need all the memory */
   load("gpsrec.app.js");
-})();
+})()

apps/gpssetup/settings.js

@@ -1,4 +1,4 @@
 (function(back) {
-  // just go right to our app
+  /* just go right to our app*/
   load("gpssetup.app.js");
-})();
+})()

apps/iconlaunch/settings.js

@@ -50,4 +50,4 @@
     },
   };
   E.showMenu(appMenu);
-});
+})

apps/infoclk/ChangeLog

@@ -12,3 +12,4 @@
       Broke out config loading into separate file to avoid duplicating a whole bunch of code
       Added support for fast loading
 0.10: Minor code improvements
+0.11: Make sure variables are properly defined in settings.js

apps/infoclk/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "infoclk",
   "name": "Informational clock",
-  "version": "0.10",
+  "version": "0.11",
   "description": "A configurable clock with extra info and shortcuts when unlocked, but large time when locked",
   "readme": "README.md",
   "icon": "icon.png",
@@ -41,4 +41,4 @@
   "dependencies": {
     "weather": "app"
   }
-}
+}

apps/infoclk/settings.js

@@ -17,6 +17,9 @@
         } else return '' + hour;
     }
 
+  let minute; // Is used in onchange functions. Defined here to appease the linter.
+  let hour; // Is used in onchange functions. Defined here to appease the linter.
+
     // The menu for configuring when the seconds are shown
     function showSecondsMenu() {
         E.showMenu({
@@ -744,4 +747,4 @@
     }
 
     showMainMenu();
-});
+})

apps/largeclock/settings.js

@@ -82,4 +82,4 @@
   };
 
   E.showMenu(mainMenu);
-});
+})

apps/launch/settings.js

@@ -34,4 +34,4 @@
     }
   };
   E.showMenu(appMenu);
-});
+})

apps/lint_exemptions.js

@@ -528,7 +528,7 @@ module.exports = {
     ]
   },
   "apps/usgs/settings.js": {
-    "hash": "af1b7bc7e041c1e6988b407b6c8ee66dbd6a0e181a20caf102d2abdb6dbd5ac0",
+    "hash": "00ee672a6920f5667bfbd2988fd2853cfd579895a843ae036a00028dcb13878d",
     "rules": [
       "no-undef"
     ]

apps/messagelist/settings.js

@@ -136,4 +136,4 @@
   }
 
   showMainMenu();
-});
+})

apps/messages/settings.js

@@ -97,4 +97,4 @@
     },
   };
   E.showMenu(mainmenu);
-});
+})

apps/messages_light/messages_light.settings.js

@@ -23,5 +23,4 @@
       },
     };
     E.showMenu(mainmenu);
-  });
-  
+  })

apps/messagesoverlay/settings.js

@@ -63,4 +63,4 @@
   }
 
   E.showMenu(buildMainMenu());
-});
+})

apps/metronome/settings.js

@@ -45,4 +45,4 @@
     },
   };
   E.showMenu(menu);
-});
+})

apps/multitimer/settings.js

@@ -29,4 +29,4 @@
       }
     },
   });
-});
+})

apps/nesclock/settings.js

@@ -39,4 +39,4 @@
 
   E.showMenu(mainmenu);
 
-});
+})

apps/nightwatch/nightwatch.settings.js

@@ -22,4 +22,4 @@
       }
     },
   });
-});
+})

apps/owmweather/settings.js

@@ -81,4 +81,4 @@
   }
 
   E.showMenu(buildMainMenu());
-});
+})

apps/pebble/pebble.settings.js

@@ -54,4 +54,4 @@
       }
     },
   });
-});
+})

apps/pebbled/pebbled.settings.js

@@ -55,4 +55,4 @@
             },
         }
     });
-});
+})

apps/popconlaunch/settings.js

@@ -12,4 +12,4 @@
         },
     };
     E.showMenu(menu);
-});
+})

apps/poweroff/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Add prompt before shutdown
 0.03: Add settings to configure prompt
 0.04: Minor code improvements
+0.05: Comment out unused function in settings.js

apps/poweroff/metadata.json

@@ -1,7 +1,7 @@
 { "id": "poweroff",
 "name": "Poweroff",
 "shortName":"Poweroff",
-"version": "0.04",
+"version": "0.05",
 "description": "Simple app to power off your Bangle.js",
 "icon": "app.png",
 "tags": "tool, poweroff, shutdown",

apps/poweroff/settings.js

@@ -8,26 +8,26 @@
     require('Storage').writeJSON(FILE, settings);
   }
 
-  // Helper method which uses int-based menu item for set of string values
-  function stringItems(startvalue, writer, values) {
-    return {
-      value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
-      format: v => values[v],
-      min: 0,
-      max: values.length - 1,
-      wrap: true,
-      step: 1,
-      onchange: v => {
-        writer(values[v]);
-        writeSettings();
-      }
-    };
-  }
-
-  // Helper method which breaks string set settings down to local settings object
-  function stringInSettings(name, values) {
-    return stringItems(settings[name], v => settings[name] = v, values);
-  }
+  //// Helper method which uses int-based menu item for set of string values
+  //function stringItems(startvalue, writer, values) {
+  //  return {
+  //    value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
+  //    format: v => values[v],
+  //    min: 0,
+  //    max: values.length - 1,
+  //    wrap: true,
+  //    step: 1,
+  //    onchange: v => {
+  //      writer(values[v]);
+  //      writeSettings();
+  //    }
+  //  };
+  //}
+  //
+  //// Helper method which breaks string set settings down to local settings object
+  //function stringInSettings(name, values) {
+  //  return stringItems(settings[name], v => settings[name] = v, values);
+  //}
 
   var mainmenu = {
     "": {
@@ -43,4 +43,4 @@
   }
   };
   E.showMenu(mainmenu);
-});
+})

apps/puzzle15/puzzle15.settings.js

@@ -45,6 +45,4 @@
   // Actually display the menu
   E.showMenu(mainmenu);
 
-});
-
-// end of file
+})

apps/qcenter/settings.js

@@ -152,4 +152,4 @@
   }
 
   showMainMenu();
-});
+})

apps/rebbleagenda/settings.js

@@ -66,4 +66,4 @@
       },
     }
   });
-});
+})

apps/recorder/clkinfo.js

@@ -35,4 +35,4 @@
 			},
 		] : [],
 	};
-});
+})

apps/rep/settings.js

@@ -41,4 +41,4 @@
         };
     }
     E.showMenu(menu);
-});
+})

apps/saclock/settings.js

@@ -20,4 +20,4 @@
     hideWidgets: settings.hideWidgets,
   });
   E.showMenu(menu);
-});
+})

apps/sched/settings.js

@@ -76,4 +76,4 @@
       require("sched").setSettings(settings);
     })
   });
-});
+})

apps/score/score.settings.js

@@ -216,4 +216,4 @@
     }
 
   });
-})();
+})()

apps/sensortools/settings.js

@@ -102,4 +102,4 @@
   }
 
   E.showMenu(buildMainMenu());
-});
+})

apps/shadowclk/settings.js

@@ -155,4 +155,4 @@
   }
   // Initially show the menu
   showMenu();
-});
+})

apps/shortcuts/settings.js

@@ -62,5 +62,4 @@
     "BTN3 app": () => showApps("BTN3")
   };
   E.showMenu(mainMenu);
-});
-  
+})

apps/simplebgclock/settings.js

@@ -27,4 +27,4 @@
       }
     }
   });
-});
+})

apps/slomoclock/settings.js

@@ -35,4 +35,4 @@
 
   E.showMenu(appMenu);
 
-});
+})

apps/slopeclockpp/settings.js

@@ -57,4 +57,4 @@
 
 
   showMainMenu();
-});
+})

apps/smclock/settings.js

@@ -1,8 +1,8 @@
-// settings menu for Monogram Watch Face
-// Anton Clock settings were used as template
-// helper functions taken from Anton Clock
-
 (function (back) {
+  // settings menu for Monogram Watch Face
+  // Anton Clock settings were used as template
+  // helper functions taken from Anton Clock  
+  
   var FILE = "smclock.json";
   // load settings from the file
   // assign default values if it doesn't exist
@@ -87,6 +87,4 @@
 
   // Actually display the menu
   E.showMenu(mainmenu);
-});
-
-// end of file
+})

apps/speedalt/settings.js

@@ -79,4 +79,4 @@
   
   E.showMenu(appMenu);
 
-});
+})

apps/speedalt2/settings.js

@@ -99,4 +99,4 @@
   
   E.showMenu(appMenu);
 
-});
+})

apps/swp2clk/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Fix deleting from white and black lists.
 0.03: Adapt to availability of Bangle.showClock and Bangle.load
 0.04: Fix 'Uncaught ReferenceError: "__FILE__" is not defined' error (fix #2326)
+0.05: Fix settings didn't call the Storage class correctly.

apps/swp2clk/metadata.json

@@ -2,7 +2,7 @@
   "id": "swp2clk",
   "name": "Swipe back to the Clock",
   "shortName": "Swipe to Clock",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Let's you swipe from left to right on any app to return back to the clock face. Please configure in the settings app after installing to activate, since its disabled by default.",
   "icon": "app.png",
   "type": "bootloader",

apps/swp2clk/settings.js

@@ -150,10 +150,10 @@
   };
 
   var getAppList = () => {
-    var appList = storage
+    var appList = require("Storage")
       .list(/\.info$/)
       .map((appInfoFileName) => {
-        var appInfo = storage.readJSON(appInfoFileName, 1);
+        var appInfo = require("Storage").readJSON(appInfoFileName, 1);
         return (
           appInfo && {
             name: appInfo.name,
@@ -180,4 +180,4 @@
 
   settings = readSettings();
   showMainMenu();
-});
+})

apps/taglaunch/settings.js

@@ -34,4 +34,4 @@
     }
   };
   E.showMenu(appMenu);
-});
+})

apps/thunder/settings.js

@@ -37,4 +37,4 @@
 
   loadSettings();
   showMenu();
-});
+})

apps/timecal/timecal.settings.js

@@ -104,4 +104,4 @@
   };
 
   showMainMenu();
-});
+})

apps/timerclk/settings.js

@@ -312,4 +312,4 @@
     }
   };
   E.showMenu(mainMenu);
-});
+})

apps/timestamplog/settings.js

@@ -4,4 +4,4 @@ const tsl = require('timestamplog');
   function(backCb) {
     tsl.launchSettingsMenu(backCb);
   }
-);
+)

apps/toucher/settings.js

@@ -54,4 +54,4 @@
     },
     '< Back': back
   });
-});
+})

apps/touchtimer/settings.js

@@ -81,4 +81,4 @@
 
   settings = readSettings();
   showMainMenu();
-});
+})

apps/trex/settings.js

@@ -16,4 +16,4 @@
     }
   };
   E.showMenu(menu);
-});
+})

apps/usgs/settings.js

@@ -19,6 +19,9 @@
   }
 
 function popSubMenu() {
+  // FIXME: Linter complains that `data` is not defined. When I defined it 
+  // instead complained that it's not used (no-unused-vars).
+  // Also looking at `getDataStreams` it doesn't return anything so this seems wrong.
   data = getDataStreams();
 }
 function popSubMenuData(data) {
@@ -78,4 +81,4 @@ function getDataStreams() {
 
   // Show the menu
   E.showMenu(menu);
-});
+})

apps/weatherClock/settings.js

@@ -55,4 +55,4 @@
       },
     }
   });
-});
+})

apps/wid_edit/settings.js

@@ -194,4 +194,4 @@
     E.showMenu(menu);
   }
   mainMenu();
-});
+})

apps/widalarmeta/settings.js

@@ -60,4 +60,4 @@
       }
     },
   });
-});
+})

apps/widbaroalarm/settings.js

@@ -155,4 +155,4 @@
   }
 
   showMainMenu();
-});
+})

apps/widbatwarn/settings.js

@@ -42,4 +42,4 @@
     },
   };
   E.showMenu(menu);
-});
+})

apps/widbgjs/settings.js

@@ -50,4 +50,4 @@
         },
         '< Back': back,
     });
-});
+})

apps/widdst/settings.js

@@ -190,4 +190,4 @@
 
   E.showMenu(dstMenu);
 
-});
+})