Skip to content
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

added js #59

Open
wants to merge 2 commits into
base: gh-pages
Choose a base branch
from
Open

added js #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9ad7fd
added js
clenclen Feb 10, 2016
00864e1
kitchentimer.html
clenclen Feb 10, 2016
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
22 changes: 20 additions & 2 deletions countdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
function countdown(seconds){
// ...

function countdown(seconds) {

console.log(seconds)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.
'console' is not defined.


seconds--
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.


if (seconds == 0) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use '===' to compare with '0'.

console.log ("Done");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'console' is not defined.

return
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, no need for a return here, since it would do so anyway.

} else {
setTimeout(function(){
countdown(seconds)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

}, 1000);
}
}

countdown(5);





3 changes: 2 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<!DOCTYPE html>
<html>
<head>

<title>Countdown exercise</title>
<script src="countdown.js"></script>
</head>
<body>
See console.
<div id = "status">text 1</div>
</body>
</html>
180 changes: 180 additions & 0 deletions kitchentimer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
<!DOCTYPE html>
<html>
<head>
<title>kitchen timer</title>
<link href='http://fonts.googleapis.com/css?family=Lato:100,400' rel='stylesheet' type='text/css'>

<style>

*{
font-family: "Lato";
font-weight: 100;
text-align: center;
}

.container {
width: 350px;
height: 200px;
background-color: #34495e;
}
.time {
width: 90%;
height: 110px;
background-color: white;
position: relative;
display: block;
margin-left: auto;
margin-right: auto;
top:10px;
}

.time ul{
position: relative;
padding:0px;
width: 100%;
list-style: none;
top:10px;
}
.time li{
display: inline-block;
}
.time span {
width: 100%;
position: relative;
font-weight: 100;
font-size: 4em;
display: inline-block;
}
.start{
width: 120px;
height: 50px;
background-color: #27ae60;
position: absolute;
display: block;
top: 150px;
margin-left: 18px;
cursor: pointer;

}

.start:hover{
background-color: #2ecc71;
}
.start span{
width: 100%;
font-size: 1.5em;
color: white;
text-align: center;
position: relative;
top:5px;
}
.reset{
width: 120px;
height: 50px;
background-color: #c0392b;
position: absolute;
top: 150px;
left: 200px;
margin-left: 20px;
cursor: pointer;

}
.reset:hover{
background-color: #e74c3c;
}
.reset span{
width: 100%;
font-size: 1.5em;
color: white;
text-align: center;
position: relative;
top:5px;
}
.colon{
top: -5px;
}
</style>

</head>

<body>

<div class = "container">
<div class = "time">
<ul>
<li><span class= "secs">00:00:00</span></li>
</ul>
</div>
<div class = "start"><span>start</span></div>
<div class = "reset"><span>reset</span></div>
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script>

var time = 0;
var running = 0;

$(document).ready(function() {
$(".start").click(function() {
if (running == 0){
running = 1;
increment();
$(".start span").text("pause");
} else {
running = 0;
$(".start span").text("resume");
}

$(".reset").click(function(){
running = 0;
time = 0;
$(".start span").text("start");
$(".secs").text("00:00:00");

});
});
});

function increment() {
if (running == 1){
setTimeout(function(){
time++ ;
var mins = Math.floor(time/10/60);
var secs = Math.floor(time/10 % 60);
var tenths = time % 10;

if (mins < 10 ){
mins = "0" + mins;
}

if (secs < 10 ){
secs = "0" + secs;
}

$(".secs").text( mins + ":" + secs + ":" + "0" + tenths)
increment();
}, 100);
}
}

</script>

</body>
</html>
















Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, totally above and beyond the requirements of the assignment, but nice work!