From e45e3d5a6254471cfbfb13a1c448a03678311f54 Mon Sep 17 00:00:00 2001
From: Matt Walsh <github@netbymatt.com>
Date: Fri, 18 Sep 2020 14:59:58 -0500
Subject: [PATCH] functional checkboxes

---
 server/scripts/modules/travelforecast.js |  8 +++++-
 server/scripts/modules/weatherdisplay.js | 33 +++++++++++++++++-------
 server/styles/index.css                  |  1 +
 version.js                               |  2 +-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/server/scripts/modules/travelforecast.js b/server/scripts/modules/travelforecast.js
index 63dc7b5..bab6114 100644
--- a/server/scripts/modules/travelforecast.js
+++ b/server/scripts/modules/travelforecast.js
@@ -79,10 +79,16 @@ class TravelForecast extends WeatherDisplay {
 			this.longCanvas.width = 640;
 			this.longCanvas.height = 1728;
 			this.longContext = this.longCanvas.getContext('2d');
+			this.longCanvasGifs = [];
 		}
 		// set up variables
 		const cities = this.data;
 
+		// clean up existing gifs
+		this.gifs.forEach(gif => gif.pause());
+		// delete the gifs
+		this.gifs.length = 0;
+
 		this.longContext.clearRect(0,0,this.longCanvas.width,this.longCanvas.height);
 
 		// draw the "long" canvas with all cities
@@ -120,7 +126,7 @@ class TravelForecast extends WeatherDisplay {
 				const xHigh = (560 - (highString.length * 20));
 				draw.text(this.longContext, 'Star4000 Large', '24pt', '#FFFF00', xHigh, y, highString, 2);
 
-				this.gifs.push(await utils.image.superGifAsync({
+				this.longCanvasGifs.push(await utils.image.superGifAsync({
 					src: city.icon,
 					loop_delay: 100,
 					auto_play: true,
diff --git a/server/scripts/modules/weatherdisplay.js b/server/scripts/modules/weatherdisplay.js
index dbefeec..244c6c5 100644
--- a/server/scripts/modules/weatherdisplay.js
+++ b/server/scripts/modules/weatherdisplay.js
@@ -30,18 +30,20 @@ class WeatherDisplay {
 		this.navBaseCount = 0;
 		this.screenIndex = -1;	// special starting condition
 
-		if (elemId !== 'progress') this.addCheckbox(elemId, defaultEnabled);
+		// create the canvas, also stores this.elemId
+		this.createCanvas(elemId);
+
+		if (elemId !== 'progress') this.addCheckbox(defaultEnabled);
 		if (this.enabled) {
 			this.setStatus(STATUS.loading);
 		} else {
 			this.setStatus(STATUS.disabled);
 		}
-		this.createCanvas(elemId);
 	}
 
-	addCheckbox(elemId, defaultEnabled = true) {
+	addCheckbox(defaultEnabled = true) {
 		// get the saved status of the checkbox
-		let savedStatus = window.localStorage.getItem(`${elemId}Enabled`);
+		let savedStatus = window.localStorage.getItem(`${this.elemId}Enabled`);
 		if (savedStatus === null) savedStatus = defaultEnabled;
 		if (savedStatus === 'true' || savedStatus === true) {
 			this.enabled = true;
@@ -49,18 +51,26 @@ class WeatherDisplay {
 			this.enabled = false;
 		}
 
+		// refresh (or initially store the state of the checkbox)
+		window.localStorage.setItem(`${this.elemId}Enabled`, this.enabled);
+
 		// create a checkbox in the selected displays area
-		const checkbox = `<label for="${elemId}Enabled">
-							<input type="checkbox" value="true" id="${elemId}Enabled" name="${elemId}Enabled"${this.enabled?' checked':''}/>
+		const checkbox = document.createElement('template');
+		checkbox.innerHTML = `<label for="${this.elemId}Enabled">
+							<input type="checkbox" value="true" id="${this.elemId}Enabled" name="${this.elemId}Enabled"${this.enabled?' checked':''}/>
 						  ${this.name}</label>`;
+		checkbox.content.firstChild.addEventListener('change', (e) => this.checkboxChange(e));
 		const availableDisplays = document.getElementById('enabledDisplays');
-		availableDisplays.innerHTML += checkbox;
-		const checkboxElem = document.getElementById(`${elemId}Enabled`);
-		checkboxElem.addEventListener('click', this.checkboxChange);
+		availableDisplays.appendChild(checkbox.content.firstChild);
 	}
 
 	checkboxChange(e) {
-		console.log(e);
+		// update the state
+		this.enabled = e.target.checked;
+		// store the value for the next load
+		window.localStorage.setItem(`${this.elemId}Enabled`, this.enabled);
+		// calling get data will update the status and actually get the data if we're set to enabled
+		this.getData();
 	}
 
 	// set data status and send update to navigation module
@@ -114,6 +124,9 @@ class WeatherDisplay {
 		// refresh the canvas
 		this.canvas = document.getElementById(this.elemId+'Canvas');
 		this.context = this.canvas.getContext('2d');
+
+		// clean up the first-run flag in screen index
+		if (this.screenIndex < 0) this.screenIndex = 0;
 	}
 
 	finishDraw() {
diff --git a/server/styles/index.css b/server/styles/index.css
index 833a038..05e4be6 100644
--- a/server/styles/index.css
+++ b/server/styles/index.css
@@ -271,4 +271,5 @@ jsgif
 }
 #enabledDisplays label {
 	display: block;
+	max-width: 300px;
 }
\ No newline at end of file
diff --git a/version.js b/version.js
index 49daa50..23f3f62 100644
--- a/version.js
+++ b/version.js
@@ -1 +1 @@
-module.exports = '3.0.1';
\ No newline at end of file
+module.exports = '3.1.0';
\ No newline at end of file