From e0cf57d508dbf02465bd00cb0d10b56eea071d26 Mon Sep 17 00:00:00 2001
From: Joshua Horton <joshua_horton@sil.org>
Date: Wed, 30 Jun 2021 10:11:46 +0700
Subject: [PATCH] chore(web): Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/source/osk/browser/pendingLongpress.ts | 11 ++++-------
 web/source/osk/browser/subkeyPopup.ts      |  6 +++---
 web/source/osk/embedded/subkeyDelegator.ts | 15 ++++++---------
 web/source/osk/oskKey.ts                   |  6 +++---
 web/source/osk/visualKeyboard.ts           |  1 -
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/web/source/osk/browser/pendingLongpress.ts b/web/source/osk/browser/pendingLongpress.ts
index 9e708c579f..a0b90f0bae 100644
--- a/web/source/osk/browser/pendingLongpress.ts
+++ b/web/source/osk/browser/pendingLongpress.ts
@@ -23,12 +23,9 @@ namespace com.keyman.osk.browser {
       let _this = this;
       this.promise = new Promise<SubkeyPopup>(function(resolve, reject) {
         _this.resolver = resolve;
-        _this.timerId = window.setTimeout(
-          function() {
-            // It's no longer deferred; it's being fulfilled.
-            // Even if the actual subkey itself is still async.
-            _this.resolve();
-          }, _this.popupDelay);
+        // After the timeout, it's no longer deferred; it's being fulfilled.
+        // Even if the actual subkey itself is still async.
+        _this.timerId = window.setTimeout(_this.resolve, _this.popupDelay);
       });
     }
 
@@ -50,4 +47,4 @@ namespace com.keyman.osk.browser {
       }
     } 
   }
-}
\ No newline at end of file
+}
diff --git a/web/source/osk/browser/subkeyPopup.ts b/web/source/osk/browser/subkeyPopup.ts
index d9c0c05077..1207e1f32e 100644
--- a/web/source/osk/browser/subkeyPopup.ts
+++ b/web/source/osk/browser/subkeyPopup.ts
@@ -240,9 +240,9 @@ namespace com.keyman.osk.browser {
 
       for(let i=0; i < this.baseKey['subKeys'].length; i++) {
         try {
-          let sk= this.element.childNodes[i].firstChild as KeyElement;
+          let sk = this.element.childNodes[i].firstChild as KeyElement;
 
-          let onKey = sk.key.isUnderTouch(touch)
+          let onKey = sk.key.isUnderTouch(touch);
           if(onKey) {
             this.baseKey.key.highlight(false);
             this.currentSelection = sk;
@@ -259,4 +259,4 @@ namespace com.keyman.osk.browser {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/web/source/osk/embedded/subkeyDelegator.ts b/web/source/osk/embedded/subkeyDelegator.ts
index b2e75ae684..e4ec911540 100644
--- a/web/source/osk/embedded/subkeyDelegator.ts
+++ b/web/source/osk/embedded/subkeyDelegator.ts
@@ -34,7 +34,7 @@ namespace com.keyman.osk.embedded {
           this.baseKey.key.highlight(false);
         } else {
           // This is set with the base key of our current subkey elsewhere within the engine.
-          var baseKey: OSKKeySpec = this.baseKey.key.spec;
+          let baseKey: OSKKeySpec = this.baseKey.key.spec;
           var found = false;
           let selectedKey: OSKKeySpec;
 
@@ -53,10 +53,8 @@ namespace com.keyman.osk.embedded {
             throw new Error("Could not find subkey '" + keyCoreID + "' under base key '" + baseKey.coreID + "'!");
           }
 
-          if(selectedKey) {
-            keyEvent = this.vkbd.keyEventFromSpec(selectedKey as keyboards.ActiveKey, null);
-            keyEvent.vkCode=keyEvent.Lcode;
-          }
+          keyEvent = this.vkbd.keyEventFromSpec(selectedKey as keyboards.ActiveKey, null);
+          keyEvent.vkCode=keyEvent.Lcode;
         }
 
         this.resolver(keyEvent);
@@ -73,15 +71,14 @@ namespace com.keyman.osk.embedded {
     }
 
     updateTouch(touch: Touch) {
-      let baseKeyTouched = this.baseKey.key.isUnderTouch(touch);
-      this.baseKeySelected = this.baseKey.key.isUnderTouch(touch)
+      this.baseKeySelected = this.baseKey.key.isUnderTouch(touch);
 
       // Prevent highlighting & selection before the touch has moved from the base key.
       if(this.movedFromBaseKey) {
         this.baseKey.key.highlight(this.baseKeySelected);
       } else {
-        this.movedFromBaseKey = !baseKeyTouched;
+        this.movedFromBaseKey = !this.baseKeySelected;
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/web/source/osk/oskKey.ts b/web/source/osk/oskKey.ts
index da52968507..7a0bd2dd32 100644
--- a/web/source/osk/oskKey.ts
+++ b/web/source/osk/oskKey.ts
@@ -439,10 +439,10 @@ namespace com.keyman.osk {
       let x0 = dom.Utils.getAbsoluteX(btn); 
       let y0 = dom.Utils.getAbsoluteY(btn);//-document.body.scrollTop;
       
-      let x1=x0 + btn.offsetWidth;
-      let y1=y0 + btn.offsetHeight;
+      let x1 = x0 + btn.offsetWidth;
+      let y1 = y0 + btn.offsetHeight;
 
       return (x > x0 && x < x1 && y > y0 && y < y1);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/web/source/osk/visualKeyboard.ts b/web/source/osk/visualKeyboard.ts
index 22f9c76500..44024eb918 100644
--- a/web/source/osk/visualKeyboard.ts
+++ b/web/source/osk/visualKeyboard.ts
@@ -626,7 +626,6 @@ namespace com.keyman.osk {
       // Process and clear highlighting of pending target
       if(this.keyPending) {
         this.highlightKey(this.keyPending,false);
-        
         // Output character unless moved off key
         if(this.keyPending.className.indexOf('hidden') < 0 && tc > 0 && !beyondEdge) {
           this.modelKeyClick(this.keyPending, e.changedTouches[0]);