Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit b03bb4c

Browse files
Code refactor
1 parent c8ab803 commit b03bb4c

File tree

2 files changed

+17
-40
lines changed

2 files changed

+17
-40
lines changed

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727
</div>
2828

29-
<p id="outputContainer"><span class="min-width" id="hour">00</span> : <span class="min-width" id="minute">00</span> : <span class="min-width" id="second">00</span></p>
29+
<p id="outputContainer"><span class="min-width" id="outputHour">00</span> : <span class="min-width" id="outputMinute">00</span> : <span class="min-width" id="outputSecond">00</span></p>
3030

3131
<div class="stopwatch-buttons">
3232
<button onclick="StartClock()" class="clock-button" id="startBtn">Start</button>

‎main.js

Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
var inputHour;
22
var inputMinute;
33
var inputSecond;
4-
var hour = document.getElementById("hour");
5-
var minute = document.getElementById("minute");
6-
var second = document.getElementById("second");
4+
var outputHour = document.getElementById("outputHour");
5+
var outputMinute = document.getElementById("outputMinute");
6+
var outputSecond = document.getElementById("outputSecond");
77
var startBtn = document.getElementById("startBtn");
88
var stopBtn = document.getElementById("stopBtn");
99
var stopWatch;
@@ -20,7 +20,7 @@ function StartClock()
2020
{
2121
if(inputHour > 0 || inputMinute > 0 || inputSecond > 0)
2222
{
23-
hour.innerHTML = FormatTime(inputHour);
23+
outputHour.innerHTML = FormatTime(inputHour);
2424
outputContainer.style.display = "flex";
2525
startBtn.style.display = "none";
2626
stopBtn.style.display = "inline-block";
@@ -43,63 +43,40 @@ function ResetClock()
4343
document.getElementById("inputHour").value = "";
4444
document.getElementById("inputMinute").value = "";
4545
document.getElementById("inputSecond").value = "";
46-
hour.innerHTML = "00";
47-
minute.innerHTML = "00";
48-
second.innerHTML = "00";
46+
outputHour.innerHTML = "00";
47+
outputMinute.innerHTML = "00";
48+
outputSecond.innerHTML = "00";
4949
inputHour = 0;
5050
inputMinute = 0;
5151
inputSecond = 0;
5252
}
5353

5454
function myClock()
55-
{
56-
// if(inputSecond <= 0)
57-
// {
58-
// if(inputMinute <= 0)
59-
// {
60-
// if(inputHour == 0 && inputMinute == 0 && inputSecond ==0)
61-
// {
62-
// StopClock();
63-
// new Audio('./beep.mp3').play()
64-
// return;
65-
// }
66-
// else
67-
// {
68-
// inputHour--;
69-
// }
70-
// hour.innerHTML = FormatTime(inputHour);
71-
// inputMinute = 60;
72-
// }
73-
// inputMinute--;
74-
// minute.innerHTML = FormatTime(inputMinute);
75-
// inputSecond = 60;
76-
// }
77-
// inputSecond--;
78-
// second.innerHTML = FormatTime(inputSecond);
79-
80-
//debugger;
81-
55+
{
8256
if(inputSecond > 0){
8357
inputSecond--;
84-
second.innerHTML = FormatTime(inputSecond);
58+
outputSecond.innerHTML = FormatTime(inputSecond);
8559
}else{
8660
if(inputMinute > 0){
8761
inputMinute--;
88-
minute.innerHTML = FormatTime(inputMinute);
89-
inputSecond = 60;
62+
outputMinute.innerHTML = FormatTime(inputMinute);
63+
inputSecond = 59;
64+
outputSecond.innerHTML = FormatTime(inputSecond);
9065
}else{
9166
if(inputHour > 0){
9267
inputHour--;
93-
hour.innerHTML = FormatTime(inputHour);
68+
outputHour.innerHTML = FormatTime(inputHour);
9469
inputMinute = 59;
70+
outputMinute.innerHTML = FormatTime(inputMinute);
71+
inputSecond = 59;
72+
outputSecond.innerHTML = FormatTime(inputSecond);
9573
}else{
9674
StopClock();
9775
new Audio('./beep.mp3').play()
9876
return;
9977
}
10078
}
10179
}
102-
10380
}
10481

10582
function FormatTime(time)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /