luci-app-travelmate: update 2.4.0-2

* sync with travelmate 2.4.0-2
* more eslint fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>

3 files changed, 31 insertions, 24 deletions

diff --git a/applications/luci-app-travelmate/Makefile b/applications/luci-app-travelmate/Makefile
index 7826fc0d35..93bbf44820 100644
--- a/applications/luci-app-travelmate/Makefile
+++ b/applications/luci-app-travelmate/Makefile
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for Travelmate
 LUCI_DEPENDS:=+luci-base +luci-lib-uqr +travelmate
 
 PKG_VERSION:=2.4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
diff --git a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/overview.js b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/overview.js
index 14643a38f8..cc6b133239 100644
--- a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/overview.js
+++ b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/overview.js
@@ -192,7 +192,7 @@ return view.extend({
 		/*
 			poll runtime information
 		*/
-		pollData: poll.add(function () {
+		poll.add(function () {
 			return L.resolveDefault(fs.stat('/tmp/trm_runtime.json'), null).then(function (res) {
 				const status = document.getElementById('status');
 				if (res && res.size > 0) {
@@ -282,7 +282,6 @@ return view.extend({
 				])
 			]);
 		}, o, this);
-		this.pollData;
 
 		/*
 			tabbed config section
@@ -305,7 +304,7 @@ return view.extend({
 		o.optional = true;
 		o.rmempty = true;
 
-		o = s.taboption('general', form.MultiValue, 'trm_radio', _('Radio Selection'), _('Restrict travelmate to certain radio\(s\).'));
+		o = s.taboption('general', form.MultiValue, 'trm_radio', _('Radio Selection'), _('Restrict travelmate to certain radio(s).'));
 		for (let i = 0; i < result[1].length; i++) {
 			o.value(result[1][i]);
 		}
diff --git a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js
index 606cacdcb1..f92b8ae4f3 100644
--- a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js
+++ b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js
@@ -1119,30 +1119,38 @@ return view.extend({
 			save new uplink
 		*/
 		s.handleCommit = function (map, ev) {
-			var w_sections = uci.sections('wireless', 'wifi-iface'),
-				device = L.toArray(map.lookupOption('device', '_add_trm'))[0].formvalue('_add_trm'),
-				network = L.toArray(map.lookupOption('network', '_add_trm'))[0].formvalue('_add_trm'),
-				ssid = L.toArray(map.lookupOption('ssid', '_add_trm'))[0].formvalue('_add_trm'),
-				ignore_bssid = L.toArray(map.lookupOption('ignore_bssid', '_add_trm'))[0].formvalue('_add_trm'),
-				bssid = L.toArray(map.lookupOption('bssid', '_add_trm'))[0].formvalue('_add_trm'),
-				encryption = L.toArray(map.lookupOption('encryption', '_add_trm'))[0].formvalue('_add_trm');
+			const w_sections = uci.sections('wireless', 'wifi-iface');
+			const device = L.toArray(map.lookupOption('device', '_add_trm'))[0].formvalue('_add_trm');
+			const network = L.toArray(map.lookupOption('network', '_add_trm'))[0].formvalue('_add_trm');
+			const ssid = L.toArray(map.lookupOption('ssid', '_add_trm'))[0].formvalue('_add_trm');
+			const ignore_bssid = L.toArray(map.lookupOption('ignore_bssid', '_add_trm'))[0].formvalue('_add_trm');
+			const bssid = L.toArray(map.lookupOption('bssid', '_add_trm'))[0].formvalue('_add_trm');
+			const encryption = L.toArray(map.lookupOption('encryption', '_add_trm'))[0].formvalue('_add_trm');
+
+			let password = null;
+			let eap_type, auth, identity, anonymous_identity, ca_cert_usesystem, ca_cert, ieee80211w;
+			let client_cert, priv_key, priv_key_pwd;
+
 			if (encryption.includes('wpa')) {
-				var eap_type = L.toArray(map.lookupOption('eap_type', '_add_trm'))[0].formvalue('_add_trm'),
-					auth = L.toArray(map.lookupOption('auth', '_add_trm'))[0].formvalue('_add_trm'),
-					identity = L.toArray(map.lookupOption('identity', '_add_trm'))[0].formvalue('_add_trm'),
-					anonymous_identity = L.toArray(map.lookupOption('anonymous_identity', '_add_trm'))[0].formvalue('_add_trm'),
-					password = L.toArray(map.lookupOption('password', '_add_trm'))[0].formvalue('_add_trm'),
-					ca_cert_usesystem = L.toArray(map.lookupOption('ca_cert_usesystem', '_add_trm'))[0].formvalue('_add_trm'),
-					ca_cert = L.toArray(map.lookupOption('ca_cert', '_add_trm'))[0].formvalue('_add_trm'),
-					ieee80211w = L.toArray(map.lookupOption('ieee80211w', '_add_trm'))[0].formvalue('_add_trm');
+				eap_type = L.toArray(map.lookupOption('eap_type', '_add_trm'))[0].formvalue('_add_trm');
+				auth = L.toArray(map.lookupOption('auth', '_add_trm'))[0].formvalue('_add_trm');
+				identity = L.toArray(map.lookupOption('identity', '_add_trm'))[0].formvalue('_add_trm');
+				anonymous_identity = L.toArray(map.lookupOption('anonymous_identity', '_add_trm'))[0].formvalue('_add_trm');
+				password = L.toArray(map.lookupOption('password', '_add_trm'))[0].formvalue('_add_trm');
+				ca_cert_usesystem = L.toArray(map.lookupOption('ca_cert_usesystem', '_add_trm'))[0].formvalue('_add_trm');
+				ca_cert = L.toArray(map.lookupOption('ca_cert', '_add_trm'))[0].formvalue('_add_trm');
+				ieee80211w = L.toArray(map.lookupOption('ieee80211w', '_add_trm'))[0].formvalue('_add_trm');
+
 				if (eap_type.includes('tls')) {
-					var client_cert = L.toArray(map.lookupOption('client_cert', '_add_trm'))[0].formvalue('_add_trm'),
-						priv_key = L.toArray(map.lookupOption('priv_key', '_add_trm'))[0].formvalue('_add_trm'),
-						priv_key_pwd = L.toArray(map.lookupOption('priv_key_pwd', '_add_trm'))[0].formvalue('_add_trm');
+					client_cert = L.toArray(map.lookupOption('client_cert', '_add_trm'))[0].formvalue('_add_trm');
+					priv_key = L.toArray(map.lookupOption('priv_key', '_add_trm'))[0].formvalue('_add_trm');
+					priv_key_pwd = L.toArray(map.lookupOption('priv_key_pwd', '_add_trm'))[0].formvalue('_add_trm');
 				}
-			} else {
-				var password = L.toArray(map.lookupOption('key', '_add_trm'))[0].formvalue('_add_trm');
 			}
+			else {
+				password = L.toArray(map.lookupOption('key', '_add_trm'))[0].formvalue('_add_trm');
+			}
+
 			if (!ssid || ((encryption.includes('psk') || encryption.includes('wpa') || encryption.includes('sae')) && !password)) {
 				if (!ssid) {
 					ui.addNotification(null, E('p', 'Empty SSID, the uplink station could not be saved.'), 'error');