diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/Simple-Calculator.iml b/.idea/Simple-Calculator.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/Simple-Calculator.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a53c4b7 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index 44eb62a..c202317 100644 --- a/index.html +++ b/index.html @@ -9,41 +9,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + diff --git a/script.js b/script.js index 931acf1..2ca3fbf 100644 --- a/script.js +++ b/script.js @@ -1,17 +1,37 @@ +let result = document.getElementById("result") +let btn = document.querySelectorAll('.btn') +btn.forEach(function (btn) { + btn.addEventListener('click', function () { + display(btn.value) + }) +}) + + // This function clear all the values function clearScreen() { - document.getElementById("result").value = ""; + result.value = ""; } // This function display values function display(value) { - document.getElementById("result").value += value; + if (value=='+' ||value=='-' || value=='*'||value=='/'){ + if (result.value[result.value.length-1] == '+' || + result.value[result.value.length-1] == '-' || + result.value[result.value.length-1] == '*' || + result.value[result.value.length-1] == '/' ){ + + } else {result.value += value;} + } else { + + result.value += value; + + } } // This function evaluates the expression and return result function calculate() { - var p = document.getElementById("result").value; + var p = result.value; var q = eval(p); - document.getElementById("result").value = q; + result.value = q; }