Skip to content
This repository was archived by the owner on Aug 25, 2025. It is now read-only.
Open
Changes from all commits
Commits
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
114 changes: 54 additions & 60 deletions calc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $(document).ready(function() {
$("#display").text("0");

//function to display numbers
$("#numbers a").not("#clear,#decimal" ).click(function() {
$("#numbers a").not("#clear,#decimal").click(function() {

currentNumber += $(this).text();
$("#display").text(currentNumber);
Expand All @@ -25,59 +25,54 @@ $(document).ready(function() {
});
});

$("#decimal").click(function() {



if( currentNumber.indexOf(".") === -1) {
console.log("#numbers", {
operator,
storedNumber,
currentNumber,
previousOperator
});
currentNumber += $(this).text();
$("#display").text(currentNumber);

}
})
$("#decimal").click(function() {
if (currentNumber.indexOf(".") === -1) {
console.log("#numbers", {
operator,
storedNumber,
currentNumber,
previousOperator
});
currentNumber += $(this).text();
$("#display").text(currentNumber);
}
})

// function to allow use of arithmatic operators
$("#operators a").not("#equals").click(function() {
operator = $(this).text();

if(previousOperator){
if (previousOperator) {

if (previousOperator === "+") {
storedNumber = storedNumber + parseFloat(currentNumber, 10);
if (previousOperator === "+") {
storedNumber = storedNumber + parseFloat(currentNumber, 10);

} else if (previousOperator === "-") {
storedNumber = storedNumber - parseFloat(currentNumber, 10);
} else if (previousOperator === "-") {
storedNumber = storedNumber - parseFloat(currentNumber, 10);

} else if (previousOperator === "/") {
storedNumber = storedNumber / parseFloat(currentNumber, 10);
} else if (previousOperator === "/") {
storedNumber = storedNumber / parseFloat(currentNumber, 10);

} else if (previousOperator === "*") {
storedNumber = storedNumber * parseFloat(currentNumber, 10);
}
} else if (previousOperator === "*") {
storedNumber = storedNumber * parseFloat(currentNumber, 10);

// addTogether = storedNumber + currentNumber;
console.log("#operators", {
operator,
storedNumber,
currentNumber,
previousOperator
});
}
else {
storedNumber = parseFloat(currentNumber, 10) ;
}
$("#display").text(operator);
//parse the string being added to storedNumber to convert to number
}
console.log("#operators", {
operator,
storedNumber,
currentNumber,
previousOperator
});
} else {
storedNumber = parseFloat(currentNumber, 10);

}
$("#display").text(operator);
//parse the string being added to storedNumber to convert to number
// storedNumber = parseFloat(currentNumber, 10) ;
currentNumber = "";
currentNumber = "";

previousOperator = operator;
previousOperator = operator;
});

//function to clear input
Expand All @@ -94,7 +89,6 @@ if( currentNumber.indexOf(".") === -1) {

//function to output equals sum to display
$("#equals").click(function() {

if (operator === "+") {
currentNumber = storedNumber + parseFloat(currentNumber, 10);

Expand All @@ -107,10 +101,10 @@ if( currentNumber.indexOf(".") === -1) {
} else if (operator === "*") {
currentNumber = storedNumber * parseFloat(currentNumber, 10);
}
$("#display").text(currentNumber);
storedNumber = parseFloat(currentNumber, 10);

storedNumber = parseFloat(currentNumber.toFixed(1), 10);
previousOperator = ""
$("#display").text(currentNumber.toFixed(1));
//console.log with an object allows all variables to be outputted if they are used(ES6). Not specific to console.log
console.log("#equals", {
operator,
Expand All @@ -121,19 +115,19 @@ if( currentNumber.indexOf(".") === -1) {
});

// function to limit input number beginning with multiple zero's
$("#zero").click(function() {
var zero = '';
for (var i = 0; i < currentNumber.length; i++) {
if (currentNumber[i] === "0") {
zero++;
}
}
if (zero > 0) {
currentNumber = parseFloat(currentNumber, 10);
$("#display").text(currentNumber);
} else {
currentNumber += "0";
$("#display").text(currentNumber);
}
});
$("#zero").click(function() {
var zero = '';
for (var i = 0; i < currentNumber.length; i++) {
if (currentNumber[i] === "0") {
zero++;
}
}
if (zero > 0) {
currentNumber = parseFloat(currentNumber, 10);
$("#display").text(currentNumber);
} else {
currentNumber += "0";
$("#display").text(currentNumber);
}
});
});