fix the percent complete (#114)

and resume the most recent game played
philschatz · Feb 24, 2019 · 13cac4b · 13cac4b
1 parent 5218f9b
commit 13cac4b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/src/browser/WebworkerTableEngine.ts b/src/browser/WebworkerTableEngine.ts
@@ -100,13 +100,6 @@ export default class WebworkerTableEngine implements Engineish {
         clearInterval(this.inputInterval)
     }
 
-    private pollInputWatcher() {
-        const button = this.inputWatcher.pollControls()
-        if (button) {
-            this.press(button)
-        }
-    }
-
     public press(button: INPUT_BUTTON) {
         this.worker.postMessage({ type: MESSAGE_TYPE.PRESS, button })
     }
@@ -123,6 +116,13 @@ export default class WebworkerTableEngine implements Engineish {
             this.inputInterval = window.setInterval(this.pollInputWatcher, 10)
         }
     }
+
+    private pollInputWatcher() {
+        const button = this.inputWatcher.pollControls()
+        if (button) {
+            this.press(button)
+        }
+    }
     private async messageListener({ data }: {data: WorkerResponse}) {
         switch (data.type) {
             case MESSAGE_TYPE.ON_GAME_CHANGE:

diff --git a/src/pwa-app.ts b/src/pwa-app.ts
@@ -142,14 +142,16 @@ window.addEventListener('load', () => {
             gameSelection.removeAttribute('disabled')
 
             saveCurrentLevelNum(currentGameId, newLevelNum)
-            updateGameSelectionInfo()
+            updateGameSelectionInfo(false)
         },
         onGameChange(gameData) {
             saveGameInfo(currentGameId, gameData.levels, gameData.title)
         }
     }
 
-    updateGameSelectionInfo() // update the % complete in the dropdown
+    // update the % complete in the dropdown AND
+    // Select the first game (not IceCrates all the time)
+    updateGameSelectionInfo(true)
 
     // startTableEngine
     if (!table) { throw new Error(`BUG: Could not find table on the page`) }
@@ -269,7 +271,7 @@ window.addEventListener('load', () => {
         option.setAttribute('data-original-index', `${index}`)
     })
 
-    function updateGameSelectionInfo() {
+    function updateGameSelectionInfo(selectFirstGame: boolean) {
         const storage = loadStorage()
 
         // Update the last-updated time for all of the games and then sort them
@@ -281,7 +283,7 @@ window.addEventListener('load', () => {
             }
             const gameInfo = storage[gameId]
             if (gameInfo) {
-                const completedMapLevels = gameInfo.levelMaps.slice(0, gameInfo.currentLevelNum - 1).filter((b) => b).length
+                const completedMapLevels = gameInfo.levelMaps.slice(0, gameInfo.currentLevelNum).filter((b) => b).length
                 const totalMapLevels = gameInfo.levelMaps.filter((b) => b).length
                 const percent = Math.floor(100 * completedMapLevels / totalMapLevels)
                 option.setAttribute('data-percent-complete', `${percent}`)
@@ -350,8 +352,20 @@ window.addEventListener('load', () => {
         if (completedOptions.length > 0) {
             completedOptions.unshift(createSeparator('Completed'))
         }
-        gameSelection.append(...continuePlayingOptions, ...newGameOptions, ...uncompletedOptions, ...completedOptions)
+        const allOptions = [...continuePlayingOptions, ...newGameOptions, ...uncompletedOptions, ...completedOptions]
+        gameSelection.append(...allOptions)
+
         gameSelection.value = selectedGameId
+
+        // Select the 1st game so we can select it if this is the initial load
+        if (selectFirstGame) {
+            const firstOption = allOptions.find((option) => option.hasAttribute('value'))
+            if (firstOption) {
+                gameSelection.selectedIndex = allOptions.indexOf(firstOption)
+                const gameId = firstOption.getAttribute('value')
+                if (gameId) gameSelection.value = gameId
+            }
+        }
     }
 
     function createSeparator(textContent: string) {