Merge pull request #5 from mnaray/master

fix issue #4

Author: harsh98trivedi

calc.js

@@ -1,78 +1,98 @@
-console.log("Javascript Calculator Made by Harsh Trivedi\nhttps://harsh98trivedi.github.io")
+console.log(
+    "Javascript Calculator Made by Harsh Trivedi\nhttps://harsh98trivedi.github.io"
+);
 
-document.getElementById('answer').readOnly = true; //set this attribute in Html file
-let screen = document.getElementById('answer');
-buttons = document.querySelectorAll('button');
-let screenValue = '';
+document.getElementById("answer").readOnly = true; //set this attribute in Html file
+let screen = document.getElementById("answer");
+buttons = document.querySelectorAll("button");
+let screenValue = "";
 for (item of buttons) {
-    item.addEventListener('click', (e) => {
-        // console.log(buttonText, "has been pressed");
+    item.addEventListener("click", (e) => {
         buttonText = e.target.innerText;
-        if (buttonText == 'X') {
-            buttonText = '*';
+        if (buttonText == "X") {
+            buttonText = "*";
             screenValue += buttonText;
             screen.value = screenValue;
-        }
-        else if (buttonText == 'C') {
+        } else if (buttonText == "C") {
             screenValue = "";
             screen.value = screenValue;
-        }
-        else if (buttonText == '=') {
-            screen.value = eval(screenValue);
-        }
-        else {
+        } else if (buttonText == "=") {
+            // Check if there's a number directly infront of bracket
+            if (
+                screen.value.includes("(") &&
+                !isNaN(screen.value.charAt(screen.value.indexOf("(") - 1))
+            ) {
+                window.onBracketMultiplication();
+                return;
+            } else {
+                screen.value = eval(screenValue);
+            }
+        } else {
             screenValue += buttonText;
             screen.value = screenValue;
         }
-
-    })
+    });
 }
 
-document.addEventListener("keydown", function(event) {
+document.addEventListener("keydown", function (event) {
     console.log(event.which);
-    if(event.shiftKey==57){
-        event.key = '(';
+    if (event.shiftKey == 57) {
+        event.key = "(";
+    } else if (event.shiftKey == 48) {
+        event.key = ")";
+    } else if (event.shiftKey == 53) {
+        event.key = "%";
     }
-    else if(event.shiftKey==48){
-        event.key = ')';
-    }
-    else if(event.shiftKey==53){
-        event.key = '%';
-    }
-    if(event.keyCode==88){
-        screenValue += '*';
+    if (event.keyCode == 88) {
+        screenValue += "*";
         screen.value = screenValue;
     }
-    if(event.key<=9 || event.key=='+' || event.key=='-' || event.key=='*' || event.key=='.' || event.key=='/' || event.key=='%' || event.key=='(' || event.key==')'){
+    if (
+        event.key <= 9 ||
+        event.key == "+" ||
+        event.key == "-" ||
+        event.key == "*" ||
+        event.key == "." ||
+        event.key == "/" ||
+        event.key == "%" ||
+        event.key == "(" ||
+        event.key == ")"
+    ) {
         screenValue += event.key;
         screen.value = screenValue;
     }
-    if(event.keyCode == 13 || event.keyCode == 187)
-    {
+    if (event.keyCode == 13 || event.keyCode == 187) {
         screen.value = eval(screenValue);
-    }
-    else if(event.keyCode == 46){
+    } else if (event.keyCode == 46) {
         screenValue = "";
         screen.value = screenValue;
         console.clear();
-    }
-    else if(event.keyCode == 8){
+    } else if (event.keyCode == 8) {
         screenValue = screenValue.slice(0, -1);
         screen.value = screenValue;
-    }
-    else if(event.keyCode == 67){
+    } else if (event.keyCode == 67) {
         screenValue = "";
         screen.value = screenValue;
         console.clear();
-    }
-    else if(event.keyCode == 82){
+    } else if (event.keyCode == 82) {
         location.reload();
     }
-  })
+});
 
-  window.onerror = function(){
-      alert("PLEASE INPUT VALID EXPRESSION");
-      screenValue = "";
-      screen.value = screenValue;
-      console.clear();
-  }
+window.onerror = function () {
+    alert("PLEASE INPUT VALID EXPRESSION");
+    screenValue = "";
+    screen.value = screenValue;
+    console.clear();
+};
+
+window.onBracketMultiplication = function () {
+    screenValue = addStr(screen.value, screen.value.indexOf("("), "*");
+    screen.value = eval(screenValue);
+};
+
+function addStr(str, index, stringToAdd) {
+    return (
+        str.substring(0, index) + stringToAdd + str.substring(index, str.length)
+    );
+}