weather: add semicolons, replace substr with match

apps/weather/app.js

@@ -50,5 +50,5 @@
   }
 
   // Show launcher when middle button pressed
-  setWatch(Bangle.showLauncher, BTN2, {repeat: false, edge: 'falling'})
+  setWatch(Bangle.showLauncher, BTN2, {repeat: false, edge: 'falling'});
 })()

apps/weather/lib.js

@@ -1,13 +1,13 @@
 exports = {
   save: weather => {
-    let json = require('Storage').readJSON('weather.json')||{}
+    let json = require('Storage').readJSON('weather.json')||{};
-    json.weather = Object.assign({}, weather) // don't mutate GB events
+    json.weather = Object.assign({}, weather); // don't mutate GB events
-    delete json.weather.t // don't save the event type (if present)
+    delete json.weather.t; // don't save the event type (if present)
-    require('Storage').write('weather.json', json)
+    require('Storage').write('weather.json', json);
   },
   load: () => {
-    let json = require('Storage').readJSON('weather.json')||{}
+    let json = require('Storage').readJSON('weather.json')||{};
-    return json.weather
+    return json.weather;
   },
   drawIcon: (cond, x, y, r) => {
     function drawSun(x, y, r) {
@@ -171,6 +171,6 @@ exports = {
       return drawMist;
     }
 
-    chooseIcon(cond)(x, y, r)
+    chooseIcon(cond)(x, y, r);
   },
 }

apps/weather/widget.js

@@ -1,19 +1,19 @@
 (() => {
   function draw() {
-    const w = require('weather').load()
+    const w = require('weather').load();
     if (!w) return;
     g.reset();
-    g.setColor(0).fillRect(this.x, this.y, this.x+this.width-1, this.y+23)
+    g.setColor(0).fillRect(this.x, this.y, this.x+this.width-1, this.y+23);
     if (w.txt) {
       require('weather').drawIcon(w.txt, this.x+10, this.y+8, 7.5);
     }
     if (w.temp) {
       let t = require('locale').temp(w.temp-273.15);  // applies conversion
-      t = t.substr(0, t.length-2); // but we have no room for units
+      t = t.match(/[\d\-]*/)[0]; // but we have no room for units
       g.setFontAlign(0, 1); // center horizontally at bottom of widget
       g.setFont('6x8', 1);
-      g.setColor(-1)
+      g.setColor(-1);
-      g.drawString(t, this.x+10, this.y+24)
+      g.drawString(t, this.x+10, this.y+24);
     }
   }
 
@@ -22,10 +22,10 @@
   function update(weather) {
     require('weather').save(weather);
     if (!WIDGETS["weather"].width) {
-      WIDGETS["weather"].width = 20
+      WIDGETS["weather"].width = 20;
-      Bangle.drawWidgets()
+      Bangle.drawWidgets();
     } else if (Bangle.isLCDOn()) {
-      WIDGETS["weather"].draw()
+      WIDGETS["weather"].draw();
     } else {
       dirty = true;
     }
@@ -46,6 +46,6 @@
 
   WIDGETS["weather"] = {area: "tl", width: 20, draw: draw};
   if (!require('weather').load()) {
-    WIDGETS["weather"].width = 0
+    WIDGETS["weather"].width = 0;
   }
 })();