Skip to content

Commit d89dd6c

Browse files
Merge pull request harsh98trivedi#21 from Mohamedhazeem/master
Update Deprecated Keycode and Prevent Default state of Enter Key
2 parents a2a55e3 + a06ab93 commit d89dd6c

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

calc.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,21 @@ document.addEventListener("keydown", function (event) {
7575
screenValue += event.key;
7676
screen.value = screenValue;
7777
}
78-
if (event.keyCode == 13 || event.keyCode == 187) {
78+
if (event.key == "Enter" || event.key == "=") {
79+
event.preventDefault();
7980
checkForBracketMulti(); // automatically evaluates if no brackets
80-
} else if (event.keyCode == 46) {
81+
} else if (event.Key == "Delete") {
8182
screenValue = "";
8283
screen.value = screenValue;
8384
console.clear();
84-
} else if (event.keyCode == 8) {
85+
} else if (event.key == "Backspace") {
8586
screenValue = screenValue.slice(0, -1);
8687
screen.value = screenValue;
87-
} else if (event.keyCode == 67) {
88+
} else if (event.key == "c") {
8889
screenValue = "";
8990
screen.value = screenValue;
9091
console.clear();
91-
} else if (event.keyCode == 82) {
92+
} else if (event.key == "r") {
9293
location.reload();
9394
}
9495
});
@@ -104,10 +105,10 @@ window.onBracketMultiplication = function () {
104105
screenValue = addStr(screen.value, screen.value.indexOf("("), "*");
105106
screen.value = eval(screenValue);
106107
let calcHistory = JSON.parse(localStorage.getItem("calcHistory")) || [];
107-
if(calcHistory.length >= maxItems){
108-
calcHistory.shift();
108+
if (calcHistory.length >= maxItems) {
109+
calcHistory.shift();
109110
}
110-
calcHistory.push({screenValue, result : screen.value});
111+
calcHistory.push({ screenValue, result: screen.value });
111112
localStorage.setItem("calcHistory", JSON.stringify(calcHistory));
112113
};
113114

@@ -128,10 +129,10 @@ function checkForBracketMulti() {
128129
} else {
129130
screen.value = eval(screenValue);
130131
let calcHistory = JSON.parse(localStorage.getItem("calcHistory")) || [];
131-
if(calcHistory.length >= maxItems){
132-
calcHistory.shift();
132+
if (calcHistory.length >= maxItems) {
133+
calcHistory.shift();
133134
}
134-
calcHistory.push({screenValue, result : screen.value});
135+
calcHistory.push({ screenValue, result: screen.value });
135136
localStorage.setItem("calcHistory", JSON.stringify(calcHistory));
136137
}
137138
flag = 1;

0 commit comments

Comments
 (0)