calculator is working

angaaruriakhil · Aug 19, 2021 · 4aa5d06 · 4aa5d06
1 parent 6a4e1fc
commit 4aa5d06
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/dist/main.dev.js b/dist/main.dev.js
@@ -5,11 +5,9 @@ var screenOutput = document.querySelector("#screen_output"); // Special Button F
 // If statement used here to stop 2 operators being used in succession. 
 
 function equals(event) {
-  var regex_equals = /[=]/;
-
-  if (!regex_equals.test(screenOutput.innerHTML)) {
-    screenOutput.innerHTML += event.target.innerHTML;
-  }
+  screenOutput.innerText = "";
+  var calculation = eval(screen.innerText);
+  screenOutput.innerText += " = ".concat(calculation.toString());
 }
 
 function decimal_point(event) {

diff --git a/index.html b/index.html
@@ -14,24 +14,24 @@
       <div id= "screen_output"> </div> 
     </div>
     <div id = "buttons"> 
-      <button id="ac" class = "buttons special_buttons"> AC </button>
-      <button id ="delete" class = "buttons special_buttons"> DEL </button>
-      <button id="multiply" class = "buttons special_buttons"> * </button>
-      <button id="add" class = "buttons special_buttons"> + </button>
-      <button id="subtract" class = "buttons special_buttons"> - </button>
-      <button id="divide" class = "buttons special_buttons"> ÷ </button>
-      <button id="decimal_point" class = "buttons special_buttons"> . </button>
-      <button id="equals" class = "buttons special_buttons"> = </button>
-      <button id="one" class = "buttons numbers"> 1 </button>
-      <button id="two" class = "buttons numbers"> 2 </button>
-      <button id="three" class = "buttons numbers"> 3 </button>
-      <button id="four" class = "buttons numbers"> 4 </button>
-      <button id="five" class = "buttons numbers"> 5 </button>
-      <button id="six" class = "buttons numbers"> 6 </button>
-      <button id="seven" class = "buttons numbers"> 7 </button>
-      <button id="eight" class = "buttons numbers"> 8 </button>
-      <button id="nine" class = "buttons numbers"> 9 </button>
-      <button id="zero" class = "buttons numbers"> 0 </button>
+      <button id="ac" class = "buttons special_buttons">AC</button>
+      <button id ="delete" class = "buttons special_buttons">DEL</button>
+      <button id="multiply" class = "buttons special_buttons">*</button>
+      <button id="add" class = "buttons special_buttons">+</button>
+      <button id="subtract" class = "buttons special_buttons">-</button>
+      <button id="divide" class = "buttons special_buttons">/</button>
+      <button id="decimal_point" class = "buttons special_buttons">.</button>
+      <button id="equals" class = "buttons special_buttons">=</button>
+      <button id="one" class = "buttons numbers">1</button>
+      <button id="two" class = "buttons numbers">2</button>
+      <button id="three" class = "buttons numbers">3</button>
+      <button id="four" class = "buttons numbers">4</button>
+      <button id="five" class = "buttons numbers">5</button>
+      <button id="six" class = "buttons numbers">6</button>
+      <button id="seven" class = "buttons numbers">7</button>
+      <button id="eight" class = "buttons numbers">8</button>
+      <button id="nine" class = "buttons numbers">9</button>
+      <button id="zero" class = "buttons numbers">0</button>
       </div>
   </>
 </body>

diff --git a/main.js b/main.js
@@ -7,10 +7,9 @@ let screenOutput = document.querySelector("#screen_output");
 // If statement used here to stop 2 operators being used in succession. 
 
 function equals(event) {
-  let regex_equals = /[=]/
-  if (!regex_equals.test(screenOutput.innerHTML)) {
-    screenOutput.innerHTML += event.target.innerHTML
-  }
+  screenOutput.innerText = ""; 
+  let calculation = eval(screen.innerText);
+  screenOutput.innerText += ` = ${calculation.toString()}`
 }
 
 function decimal_point(event) {