Octavia/odin-calculator
Watch
1
0
Fork
You've already forked odin-calculator
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create secondary script for troubleshooting and code rewrite

Browse source
This commit is contained in:
lolabird 2023-12-27 16:51:02 -07:00
commit f94479f2d2
3 changed files with 154 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
script.js
View file

@ -3,6 +3,7 @@ const topScreen = document.querySelector(".top-screen");
const buttons = document.querySelectorAll("button");
const operators = ["+", "-", "*", "/"];
let inOps = false;
let isEval = false;
buttons.forEach((button) => {
@ -11,13 +12,20 @@ buttons.forEach((button) => {
function displayToScreen() {
console.log(inOps);
console.log("inOps:", inOps);
console.log("isEval:", isEval);
if (this.className == "equal") {
let calc = new Calculator;
inOps = true;
topScreen.textContent += mainScreen.textContent;
if (isEval) {
topScreen.textContent = mainScreen.textContent;
isEval = false;
} else {
topScreen.textContent += mainScreen.textContent;
}
mainScreen.textContent = calc.calculate(topScreen.textContent);
} else if (this.classList.contains("all")) {
@ -38,8 +46,15 @@ function displayToScreen() {
} else {
if (this.className == "operator") {
let screenContent = topScreen.textContent;
topScreen.textContent += mainScreen.textContent + " " + this.textContent + " ";
inOps = true;
if (isEval) {
topScreen.textContent = mainScreen.textContent + " " + this.textContent + " "
isEval = false
} else {
topScreen.textContent += mainScreen.textContent + " " + this.textContent + " ";
}
// Add some logic for handling negatives with -
// Add key support
// limit character size in mainScreen -- first step is to move numbers from the main mainScreen to somewhere else every time a new operator is used and then change what gets sent to the calculator to that new location
@ -47,7 +62,7 @@ function displayToScreen() {
for (let i = 0; i < screenContent.length; i++ ) {
if (operators.includes(screenContent[i])) {
let calc = new Calculator;
result = calc.calculate(topScreen.textContent);
let result = calc.calculate(topScreen.textContent);
mainScreen.textContent = result;
break;
}
@ -106,6 +121,7 @@ function divideDecimals(a, b) {
function Calculator(str) {
console.log("Calculator has been called")
isEval = true;
this.methods = {
"-": (a, b) => addDecimals(a, -b),