From 3cab30027a4c3704d36606b534bb2cd48cc5f504 Mon Sep 17 00:00:00 2001 From: Zach Graham Date: Fri, 4 Aug 2023 20:52:58 -0500 Subject: [PATCH] Cleanup --- js/artsey-tutor.js | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/js/artsey-tutor.js b/js/artsey-tutor.js index 39ca85e..1794a4b 100644 --- a/js/artsey-tutor.js +++ b/js/artsey-tutor.js @@ -90,54 +90,33 @@ async function getMappingForLetter(letter) { } async function setNextLetter() { - if (currentletterIndex > currentString.length-1) { + let letterbox = $("#letterbox"); + if (currentLetterIndex > currentString.length-1) return; - } - let prevIndex = currentletterIndex-1; - if (prevIndex >= -1) { - await unhighlightLetter($("#letterbox").children()[currentletterIndex]); - } - currentletterIndex++; - currentLetter = currentString.charAt(currentletterIndex).toLowerCase(); + let prevIndex = currentLetterIndex-1; + if (prevIndex >= -1) + await unhighlightLetter(letterbox.children()[currentLetterIndex]); + currentLetterIndex++; + currentLetter = currentString.charAt(currentLetterIndex).toLowerCase(); currentMapping = mappings[(await getMappingForLetter(currentLetter)).toString()]; - await highlightLetter($("#letterbox").children()[currentletterIndex]); + await highlightLetter(letterbox.children()[currentLetterIndex]); await artseyDraw(); } -let currentletterIndex = -1; +let currentLetterIndex = -1; let currentLetter = ''; let currentString = "hello world"; let currentMapping = [0, 0, 0, 0, 0, 0, 0, 0]; $(document).ready(async function () { - - $( "body" ).on( "click", function(event) { - // $( "#target" ).trigger( "keyup" ); - console.log(event); - } ); - - $( "#typing-text" ).on( "keypress", function() { - //console.log( "Handler for `keypress` called." ); - console.log($("#typing-text").text()); - } ); - $('body').on("keyup", (function(e) { - //alert('Handler for .keyup() called.'); - $('#typing-text').focus(); console.log("current letter: " + currentLetter + " typed letter: " + String.fromCharCode(e.which).toLowerCase()); - - if (currentLetter === String.fromCharCode(e.which).toLowerCase()) { + if (currentLetter === String.fromCharCode(e.which).toLowerCase()) setNextLetter(); - } })); - console.log("ready! Here's a demo."); + await sleep(1000); await setTypingText(currentString); await sleep(500); await setNextLetter(); - - // for (let i = 0; i < currentString.length; i++) { - // await setNextLetter(); - // await sleep(1000); - // } }); \ No newline at end of file