Skip to content

Commit c5e813e

Browse files
committed
feat(JS) refactor code by creating canUserAddDot() and pass it in if statement with condition (buttonValue === .)
1 parent b29f987 commit c5e813e

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

index.js

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,7 @@ btns.forEach((btn) => {
7878
}
7979

8080
if (buttonValue === ".") {
81-
var dotAllowed = true;
82-
for (var i = data.length - 1; i >= 0; i--) {
83-
console.log("data > " + data[i]);
84-
if (data[i] === ".") {
85-
dotAllowed = false;
86-
break;
87-
} else if (/[\/*\-+]/.test(data[i])) {
88-
break;
89-
}
90-
debugger;
91-
}
92-
if (dotAllowed) {
93-
if (data.length == 0) {
94-
data.push("0");
95-
} else if (/[\/*\-+]/.test(data[data.length - 1])) {
96-
data.push("0");
97-
}
98-
data.push(".");
99-
}
100-
console.log(data);
101-
102-
screen.innerText = data.join("");
81+
canUserAddDot();
10382
}
10483

10584
if (buttonValue === "=") {
@@ -120,7 +99,6 @@ btns.forEach((btn) => {
12099
function displayResult(array, outcome) {
121100
array = [];
122101
array.push(outcome);
123-
124102
}
125103

126104
if (buttonValue === "%") {
@@ -138,3 +116,25 @@ btns.forEach((btn) => {
138116
}
139117
});
140118
});
119+
120+
function canUserAddDot() {
121+
var dotAllowed = true;
122+
for (var i = data.length - 1; i >= 0; i--) {
123+
console.log("data > " + data[i]);
124+
if (data[i] === ".") {
125+
dotAllowed = false;
126+
break;
127+
} else if (/[\/*\-+]/.test(data[i])) {
128+
break;
129+
}
130+
}
131+
if (dotAllowed) {
132+
if (data.length == 0) {
133+
data.push("0");
134+
} else if (/[\/*\-+]/.test(data[data.length - 1])) {
135+
data.push("0");
136+
}
137+
data.push(".");
138+
}
139+
screen.innerText = data.join("");
140+
}

0 commit comments

Comments
 (0)