From a7fd6ca4e5f47d9a1d65190521473e0a18bfc533 Mon Sep 17 00:00:00 2001 From: lolabird Date: Tue, 26 Dec 2023 22:29:32 -0700 Subject: [PATCH] Add space before and after operator --- script.js | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/script.js b/script.js index c202402..f484b42 100644 --- a/script.js +++ b/script.js @@ -6,45 +6,40 @@ buttons.forEach((button) => { button.addEventListener ("click", displayToScreen); }); + function displayToScreen() { if (this.className == "equal") { let calc = new Calculator; console.log(screen.textContent) - screen.textContent = calc.calculate(screen.textContent) + " "; + screen.textContent = calc.calculate(screen.textContent); } else if (this.className == "clear") { - //clear´ + screen.textContent = "0"; } else { let screenContent = screen.textContent; if (this.className == "operator") { + screen.textContent += " "; + for (let i = 0; i < screenContent.length; i++ ) { if (operators.includes(screenContent[i])) { let calc = new Calculator; - console.log(screen.textContent) - screen.textContent = calc.calculate(screen.textContent) + " "; - console.log("An operator was pressed again") + console.log(screen.textContent); + result = calc.calculate(screen.textContent); + screen.textContent += result; break; } - } - } - if (screen.textContent === "0") { - screen.textContent = this.textContent + " "; - console.log("A button was pressed"); + } + + screen.textContent += this.textContent + " "; + } else if (screen.textContent === "0" && this.className == "num") { + screen.textContent = this.textContent; } else { - screen.textContent += this.textContent + " "; - console.log("A button was pressed"); + screen.textContent += this.textContent; } - } - -} - - -function clear () { - }