Skip to content

fixedUI #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixedUI #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions BasicCalculator/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/style.css"/>
<link rel="stylesheet" href="style.css"/>
<title>Calculator</title>
</head>
<body>
Expand All @@ -24,6 +24,7 @@
<input type="button" value="8" class="nums" onclick='getkey("8")' id="num-8">
<input type="button" value="9" class="nums" onclick='getkey("9")' id="num-9">
<input type="button" value="0" class="nums" onclick='getkey("0")' id="num-0">
<input type="button" value="." class="nums" onclick='getDecimal()' id="num-decimal">

</div>
<div class="btn-oprs">
Expand All @@ -38,6 +39,6 @@
</div>
</form>
</div>
<script type = "text/javascript" src="/script.js"></script>
<script type = "text/javascript" src="script.js"></script>
</body>
</html>
55 changes: 45 additions & 10 deletions BasicCalculator/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,30 @@ const getkey = (key)=>{
if(key == '='){
output_win.innerHTML = "INVALID OPERATION";
expression = "";
firstVal = true;
}

else{
expression = key;
output_win.innerHTML += key;
output_win.innerHTML = key;
firstVal = false;
}
}
else{
if(key != '='){
expression += key;
output_win.innerHTML += key;
output_win.innerHTML = expression;
}
else{
try{

output_win.innerHTML = eval(expression).toString();
let result = eval(expression).toString();
output_win.innerHTML = result;
expression = result;
firstVal = false;
}

catch(err){
output_win.innerHTML = "INVALID OPERATION";
expression = "";
firstVal = true;
}
}
}
Expand All @@ -37,15 +39,48 @@ const getkey = (key)=>{
const getClr = ()=>{
output_win.innerHTML = "";
expression = "";
firstVal = true;
}

const leftPar = ()=>{
lp = document.getElementById('btn-leftPar').value;
output_win.innerHTML += lp;
expression += lp;
if(firstVal){
expression = lp;
output_win.innerHTML = lp;
firstVal = false;
} else {
expression += lp;
output_win.innerHTML = expression;
}
}
const rightPar = ()=>{
rp = document.getElementById('btn-rightPar').value;
output_win.innerHTML += rp;
expression += rp;
if(firstVal){
expression = rp;
output_win.innerHTML = rp;
firstVal = false;
} else {
expression += rp;
output_win.innerHTML = expression;
}
}

const getDecimal = ()=>{
if(expression == "" || expression == undefined || firstVal){
expression = "0.";
output_win.innerHTML = "0.";
firstVal = false;
}
else{

let lastOperatorIndex = Math.max(expression.lastIndexOf('+'), expression.lastIndexOf('-'),
expression.lastIndexOf('*'), expression.lastIndexOf('/'),
expression.lastIndexOf('('));
let currentNumber = expression.substring(lastOperatorIndex + 1);

if(!currentNumber.includes('.')){
expression += ".";
output_win.innerHTML = expression;
}
}
}
2 changes: 1 addition & 1 deletion BasicCalculator/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
width: 50%;
background-color:azure;
display:grid;
grid-template-columns: 50% 50%;
grid-template-columns: 33.33% 33.33% 33.33%;
place-items:center;
box-sizing: border-box;
border-radius: 10px;
Expand Down