Skip to content

Update main.js #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uk1213 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update main.js #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ const result = document.querySelector(".result");
const deleteBtn = document.querySelector(".delete");
const keys = document.querySelectorAll(".bottom span");

let operation = "";
let answer;
let decimalAdded = false;
var operation = "";
var answer;
var decimalAdded = false;
// Needless to declare let variables outside any block, better keep them as var

const operators = ["+", "-", "x", "÷"];
const operators = ["+", "-", "*", "÷"];// Changed x to * throughout, for better user interface

function handleKeyPress (e) {
const key = e.target.dataset.key;
Expand Down Expand Up @@ -45,7 +46,9 @@ function handleKeyPress (e) {
}

if (key) {
if (key === ".") decimalAdded = true;
if (key === "."){
decimalAdded = true;
}
operation += key;
input.innerHTML = operation;
return;
Expand Down Expand Up @@ -73,15 +76,14 @@ function evaluate(e) {
operation = operation.slice(1);
}

const final = operation.replace(/x/g, "*").replace(/÷/g, "/");
answer = +(eval(final)).toFixed(5);
const final = operation.replace(/÷/g, "/");//No need to replace here
answer = +(eval(final)).toFixed(7);// Rounding off in standard calculator format

if (key === "=") {
decimalAdded = false;
operation = `${answer}`;
answer = "";
input.innerHTML = operation;
result.innerHTML = answer;
operation="";
input.innerHTML = `${answer}`;// No need for extra variable here
result.innerHTML = "";
return;
}

Expand All @@ -91,7 +93,7 @@ function evaluate(e) {
if (key === "=") {
decimalAdded = false;
input.innerHTML = `<span class="error">${operation}</span>`;
result.innerHTML = `<span class="error">Bad Expression</span>`;
result.innerHTML = `<span class="error">Invalid Expression</span>`;
}
console.log(e);
}
Expand Down