Rebased

Author: haslinghuis

src/js/port_handler.js

@@ -32,9 +32,12 @@ PortHandler.initialize = function () {
 
 PortHandler.check = function () {
     const self = this;
+    let result;
 
-    ConfigStorage.get('showVirtualMode', res => self.showVirtualMode = res.showVirtualMode);
-    ConfigStorage.get('showAllSerialDevices', res => self.showAllSerialDevices = res.showAllSerialDevices);
+    result = ConfigStorage.get('showVirtualMode');
+    self.showVirtualMode = result.showVirtualMode;
+    result = ConfigStorage.get('showAllSerialDevices');
+    self.showAllSerialDevices = result.showAllSerialDevices;
 
     self.check_usb_devices();
     self.check_serial_devices();
@@ -168,7 +171,7 @@ PortHandler.detectPort = function(currentPorts) {
         currentPorts = self.updatePortSelect(currentPorts);
         console.log(`PortHandler - Found: ${JSON.stringify(newPorts)}`);
 
-        let result = ConfigStorage.get('last_used_port');
+        const result = ConfigStorage.get('last_used_port');
         if (result.last_used_port) {
             if (result.last_used_port.includes('tcp')) {
                 self.portPickerElement.val('manual');

src/js/serial.js

@@ -272,7 +272,6 @@ const serial = {
             const devices = [];
 
             devices_array.forEach(function (device) {
-                const showAllSerialDevices = ConfigStorage.get('showAllSerialDevices');
                 const isKnownSerialDevice = self.serialDevices.some(el => el.vendorId === device.vendorId) && self.serialDevices.some(el => el.productId === device.productId);
 
                 if (isKnownSerialDevice || PortHandler.showAllSerialDevices) {

src/js/tabs/options.js

@@ -130,25 +130,23 @@ options.initAutoConnectConnectionTimeout = function () {
 
 options.initShowAllSerialDevices = function() {
     const showAllSerialDevicesElement = $('div.showAllSerialDevices input');
-    ConfigStorage.get('showAllSerialDevices', result => {
-        showAllSerialDevicesElement
-            .prop('checked', !!result.showAllSerialDevices)
-            .on('change', () => ConfigStorage.set({ showAllSerialDevices: showAllSerialDevicesElement.is(':checked') }))
-            .trigger('change');
-    });
+    const result = ConfigStorage.get('showAllSerialDevices');
+    showAllSerialDevicesElement
+        .prop('checked', !!result.showAllSerialDevices)
+        .on('change', () => ConfigStorage.set({ showAllSerialDevices: showAllSerialDevicesElement.is(':checked') }))
+        .trigger('change');
 };
 
 options.initShowVirtualMode = function() {
     const showVirtualModeElement = $('div.showVirtualMode input');
-    ConfigStorage.get('showVirtualMode', result => {
-        showVirtualModeElement
-            .prop('checked', !!result.showVirtualMode)
-            .on('change', () => {
-                ConfigStorage.set({ showVirtualMode: showVirtualModeElement.is(':checked') });
-                PortHandler.initialPorts = false;
-            })
-            .trigger('change');
-    });
+    const result = ConfigStorage.get('showVirtualMode');
+    showVirtualModeElement
+        .prop('checked', !!result.showVirtualMode)
+        .on('change', () => {
+            ConfigStorage.set({ showVirtualMode: showVirtualModeElement.is(':checked') });
+            PortHandler.initialPorts = false;
+        })
+        .trigger('change');
 };
 
 options.initCordovaForceComputerUI = function () {