@@ -11,7 +11,7 @@ let answer = null;
11
11
let memStorage = 0 ;
12
12
13
13
let operation ;
14
- let init = true ;
14
+ let newInput = true ;
15
15
let divByZero = false ;
16
16
let operationDirty = false ;
17
17
let equalDirty = false ;
@@ -32,49 +32,14 @@ function setListeners() {
32
32
for ( i = 0 ; i < operationButtons . length ; i ++ ) {
33
33
operationButtons [ i ] . addEventListener ( 'click' , function ( e ) { handleOperations ( e . target . innerText ) ; } )
34
34
}
35
- document . addEventListener ( 'keydown' , function ( e ) { keyHandler ( e . key ) } ) ;
36
35
}
37
36
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
- }
72
37
73
38
function handleMemory ( e ) {
74
39
let memKey = e ;
75
40
if ( memKey === 'MR' ) {
76
41
calculatorDisplay . value = memStorage ;
77
- init = true ;
42
+ newInput = true ;
78
43
operationDirty = false ;
79
44
if ( equalDirty ) {
80
45
equalDirty = false ;
@@ -102,12 +67,12 @@ function handleNumbers(e) {
102
67
} else if ( equalDirty ) {
103
68
clearCalculator ( ) ;
104
69
calculatorDisplay . value = numberInput ;
105
- init = false ;
70
+ newInput = false ;
106
71
} else {
107
- if ( operationDirty || init ) {
72
+ if ( operationDirty || newInput ) {
108
73
calculatorDisplay . value = '' ;
109
74
operationDirty = false ;
110
- init = false ;
75
+ newInput = false ;
111
76
}
112
77
calculatorDisplay . value += numberInput ;
113
78
}
@@ -116,14 +81,6 @@ function handleNumbers(e) {
116
81
function handleOperations ( e ) {
117
82
let newOperation = e ;
118
83
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
-
127
84
if ( ! equalDirty && ! operationDirty ) {
128
85
if ( number1 === null && answer === null ) {
129
86
number1 = parseFloat ( calculatorDisplay . value ) ;
@@ -182,7 +139,7 @@ function clearCalculator() {
182
139
number1 = null ;
183
140
number2 = null ;
184
141
answer = null ;
185
- init = true ;
142
+ newInput = true ;
186
143
operationDirty = false ;
187
144
equalDirty = false ;
188
145
calculatorDisplay . value = 0 ;
0 commit comments