Skip to content

Commit 5360b38

Browse files
Completed and Ready For Review
1 parent 1066faa commit 5360b38

File tree

1 file changed

+6
-49
lines changed

1 file changed

+6
-49
lines changed

index.js

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let answer = null;
1111
let memStorage = 0;
1212

1313
let operation;
14-
let init = true;
14+
let newInput = true;
1515
let divByZero = false;
1616
let operationDirty = false;
1717
let equalDirty = false;
@@ -32,49 +32,14 @@ function setListeners() {
3232
for (i = 0; i < operationButtons.length; i++) {
3333
operationButtons[i].addEventListener('click', function(e) { handleOperations(e.target.innerText); })
3434
}
35-
document.addEventListener('keydown', function(e) { keyHandler(e.key) });
3635
}
3736

38-
function keyHandler(e) {
39-
console.log(e);
40-
switch (e) {
41-
case '.':
42-
case '0':
43-
case '1':
44-
case '2':
45-
case '3':
46-
case '4':
47-
case '5':
48-
case '6':
49-
case '7':
50-
case '8':
51-
case '9':
52-
handleNumbers(e);
53-
break;
54-
case 'c':
55-
case 'C':
56-
handleNumbers('C');
57-
break;
58-
case '+':
59-
case '-':
60-
case '*':
61-
case '/':
62-
handleOperations(e);
63-
break;
64-
case 'Enter':
65-
case '=':
66-
handleOperations('=');
67-
break;
68-
default:
69-
break;
70-
}
71-
}
7237

7338
function handleMemory(e) {
7439
let memKey = e;
7540
if (memKey === 'MR') {
7641
calculatorDisplay.value = memStorage;
77-
init = true;
42+
newInput = true;
7843
operationDirty = false;
7944
if (equalDirty) {
8045
equalDirty = false;
@@ -102,12 +67,12 @@ function handleNumbers(e) {
10267
} else if (equalDirty) {
10368
clearCalculator();
10469
calculatorDisplay.value = numberInput;
105-
init = false;
70+
newInput = false;
10671
} else {
107-
if (operationDirty || init) {
72+
if (operationDirty || newInput) {
10873
calculatorDisplay.value = '';
10974
operationDirty = false;
110-
init = false;
75+
newInput = false;
11176
}
11277
calculatorDisplay.value += numberInput;
11378
}
@@ -116,14 +81,6 @@ function handleNumbers(e) {
11681
function handleOperations(e) {
11782
let newOperation = e;
11883

119-
console.log('equalDirty =' + equalDirty);
120-
console.log('operationDirty =' + operationDirty);
121-
console.log('init =' + init);
122-
console.log('number1 =' + number1);
123-
console.log('number2 =' + number2);
124-
console.log('answer =' + answer);
125-
126-
12784
if (!equalDirty && !operationDirty) {
12885
if (number1 === null && answer === null) {
12986
number1 = parseFloat(calculatorDisplay.value);
@@ -182,7 +139,7 @@ function clearCalculator() {
182139
number1 = null;
183140
number2 = null;
184141
answer = null;
185-
init = true;
142+
newInput = true;
186143
operationDirty = false;
187144
equalDirty = false;
188145
calculatorDisplay.value = 0;

0 commit comments

Comments
 (0)