Skip to content

Commit d47d820

Browse files
bobjoerulesbobjoerules
committed
Made code cleaner
1 parent 7fccaab commit d47d820

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

‎index.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,49 +36,49 @@
3636

3737
<div style="z-index: 100;">Right Eye:
3838

39-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Default R Eye.png'; enablemouthr()">Default</button>
39+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Default R Eye.png'; enableMouth('r')">Default</button>
4040

4141
<button style="background-color: red; opacity: 0.5; cursor: default;" disabled = true; id="disr" class="righteyebutton">Disappointed</button>
4242

43-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Grin R Eye.png'; enablemouthr()">Grin</button>
43+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Grin R Eye.png'; enableMouth('r')">Grin</button>
4444

45-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Heart R Eye.png'; enablemouthr()">Heart</button>
45+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Heart R Eye.png'; enableMouth('r')">Heart</button>
4646

47-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Joy R Eye.png'; enablemouthr()">Joy</button>
47+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Joy R Eye.png'; enableMouth('r')">Joy</button>
4848

49-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/ROFL R Eye.png'; enablemouthr()">ROFL</button>
49+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/ROFL R Eye.png'; enableMouth('r')">ROFL</button>
5050

51-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Smiley R Eye.png'; enablemouthr()">Smiley</button>
51+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Smiley R Eye.png'; enableMouth('r')">Smiley</button>
5252

53-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Wink R Eye.png'; enablemouthr()">Wink</button>
53+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Wink R Eye.png'; enableMouth('r')">Wink</button>
5454

55-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Yum R Eye.png'; enablemouthr()">Yum</button>
55+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/Right Eyes/Yum R Eye.png'; enableMouth('r')">Yum</button>
5656

57-
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/nothing.png'; enablemouthr()">None</button>
57+
<button class="righteyebutton" onclick="document.getElementById('reye').src='images/nothing.png'; enableMouth('r')">None</button>
5858

5959
</div>
6060

6161
<div style="z-index: 100;">Left Eye:
6262

63-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Default L Eye.png'; enablemouthl()">Default</button>
63+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Default L Eye.png'; enableMouth('l')">Default</button>
6464

6565
<button style="background-color: red; opacity: 0.5; cursor: default;" disabled = true; id="disl" class="lefteyebutton">Disappointed</button>
6666

67-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Grin L Eye.png'; enablemouthl()">Grin</button>
67+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Grin L Eye.png'; enableMouth('l')">Grin</button>
6868

69-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Heart L eye.png'; enablemouthl()">Heart</button>
69+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Heart L eye.png'; enableMouth('l')">Heart</button>
7070

71-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Joy L Eye.png'; enablemouthl()">Joy</button>
71+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Joy L Eye.png'; enableMouth('l')">Joy</button>
7272

73-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/ROFL L Eye.png'; enablemouthl()">ROFL</button>
73+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/ROFL L Eye.png'; enableMouth('l')">ROFL</button>
7474

75-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Smiley L Eye.png'; enablemouthl()">Smiley</button>
75+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Smiley L Eye.png'; enableMouth('l')">Smiley</button>
7676

7777
<button style="background-color: red; opacity: 0.5; cursor: default;" disabled = true; id="winkl" class="lefteyebutton">Wink</button>
7878

79-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Yum L Eye.png'; enablemouthl()">Yum</button>
79+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/Left Eyes/Yum L Eye.png'; enableMouth('l')">Yum</button>
8080

81-
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/nothing.png'; enablemouthl()">None</button>
81+
<button class="lefteyebutton" onclick="document.getElementById('leye').src='images/nothing.png'; enableMouth('l')">None</button>
8282

8383
</div>
8484

‎script.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,16 @@ function disablemouth() {
162162
griningbtn.style.opacity = 0.5;
163163
griningbtn.style.cursor = 'default';
164164
}
165-
function enablemouthr(){
166-
mouthblockerr = 0
167-
enablemouth()
168-
}
169-
function enablemouthl(){
170-
mouthblockerl = 0
171-
enablemouth()
165+
166+
function enableMouth(side) {
167+
if (side === "r") {
168+
mouthblockerr = 0;
169+
}else{
170+
mouthblockerl = 0;
171+
}
172+
enablemouth();
172173
}
174+
173175
function enablemouth() {
174176
if ((mouthblockerr === 0) && (mouthblockerl === 0)){
175177
grinbtn.disabled = false;
@@ -269,4 +271,4 @@ function dragElement(elmnt) {
269271
document.ontouchend = null;
270272
document.ontouchmove = null;
271273
}
272-
}
274+
}

0 commit comments

Comments
 (0)