Skip to content

Commit c8f5593

Browse files
committed
add bracket multiplication method
1 parent 36dac61 commit c8f5593

1 file changed

Lines changed: 21 additions & 1 deletion

File tree

calc.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ for (item of buttons) {
1717
screenValue = "";
1818
screen.value = screenValue;
1919
} else if (buttonText == "=") {
20-
screen.value = eval(screenValue);
20+
// Check if there's a number directly infront of bracket
21+
if (
22+
screen.value.includes("(") &&
23+
!isNaN(screen.value.charAt(screen.value.indexOf("(") - 1))
24+
) {
25+
window.onBracketMultiplication();
26+
return;
27+
} else {
28+
screen.value = eval(screenValue);
29+
}
2130
} else {
2231
screenValue += buttonText;
2332
screen.value = screenValue;
@@ -76,3 +85,14 @@ window.onerror = function () {
7685
screen.value = screenValue;
7786
console.clear();
7887
};
88+
89+
window.onBracketMultiplication = function () {
90+
screenValue = addStr(screen.value, screen.value.indexOf("("), "*");
91+
screen.value = eval(screenValue);
92+
};
93+
94+
function addStr(str, index, stringToAdd) {
95+
return (
96+
str.substring(0, index) + stringToAdd + str.substring(index, str.length)
97+
);
98+
}

0 commit comments

Comments
 (0)