Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 19 additions & 17 deletions SpecRunner.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Jasmine Spec Runner v2.8.0</title>

<link rel="shortcut icon" type="image/png" href="jasmine/jasmine-2.8.0/jasmine_favicon.png" />
<link rel="stylesheet" href="jasmine/jasmine-2.8.0/jasmine.css" />
<head>
<meta charset="utf-8" />
<title>Jasmine Spec Runner v2.8.0</title>

<script src="jasmine/jasmine-2.8.0/jasmine.js"></script>
<script src="jasmine/jasmine-2.8.0/jasmine-html.js"></script>
<script src="jasmine/jasmine-2.8.0/boot.js"></script>
<link rel="shortcut icon" type="image/png" href="jasmine/jasmine-2.8.0/jasmine_favicon.png" />
<link rel="stylesheet" href="jasmine/jasmine-2.8.0/jasmine.css" />

<!-- Iterations 1 - 8 -->
<script src="src/chronometer.js"></script>
<script src="tests/chronometer.spec.js"></script>
<script src="jasmine/jasmine-2.8.0/jasmine.js"></script>
<script src="jasmine/jasmine-2.8.0/jasmine-html.js"></script>
<script src="jasmine/jasmine-2.8.0/boot.js"></script>

<!-- Bonus Iteration 9: Centiseconds -->
<!-- <script src="src/chronometer-centiseconds.js"></script> -->
<!-- <script src="tests/chronometer-centiseconds.spec.js"></script> -->
<!-- Iterations 1 - 8 -->
<!-- <script src="src/chronometer.js"></script>
<script src="tests/chronometer.spec.js"></script>-->

</head>
<!-- Bonus Iteration 9: Centiseconds -->
<script src="src/chronometer-centiseconds.js"></script>
<script src="tests/chronometer-centiseconds.spec.js"></script>

<body></body>
</html>
</head>

<body></body>

</html>
12 changes: 8 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>JS Chronometer</title>
<link rel="stylesheet" href="styles/style.css">
</head>

<body>

<section id="splits-container">
Expand All @@ -19,7 +21,8 @@ <h3>Splits</h3>

<section id="clock">
<div id="sphere">
<span id="minDec" class="number">0</span><span id="minUni" class="number">0</span><span>:</span><span id="secDec" class="number">0</span><span id="secUni" class="number">0</span>
<span id="minDec" class="number">0</span><span id="minUni" class="number">0</span><span>:</span><span id="secDec"
class="number">0</span><span id="secUni" class="number">0</span>

<div id="centiseconds">
<span id="centisecDec">0</span><span id="centisecUni">0</span>
Expand All @@ -38,13 +41,14 @@ <h3>Splits</h3>


<!-- Iterations 1 - 8 -->
<script src="src/chronometer.js"></script>
<!--<script src="src/chronometer.js"></script>-->

<!-- Bonus Iteration 9: Centiseconds -->
<!-- <script src="src/chronometer-centiseconds.js"></script> -->
<script src="src/chronometer-centiseconds.js"></script>



<!-- DOM manipulation logic -->
<script src="src/index.js"></script>
</body>

</html>
26 changes: 26 additions & 0 deletions src/chronometer-centiseconds.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,63 @@
class Chronometer {
constructor() {
// ... your code goes here
this.currentTime = 0;
this.intervalId = null;
}

start(printTimeCallback) {
// ... your code goes here
this.intervalId = setInterval(() => {
this.currentTime += 1;
if (printTimeCallback) {
printTimeCallback();
}
}, 10);
}

getMinutes() {
// ... your code goes here
const minutes = Math.floor(this.currentTime / 6000);
return minutes;
}

getSeconds() {
// ... your code goes here
const seconds = Math.floor((this.currentTime / 100) % 60);
return seconds;
}

getCentiseconds() {
// ... your code goes here
const centiseconds = Math.floor(this.currentTime % 100);
return centiseconds;
}

computeTwoDigitNumber(value) {
// ... your code goes here
if (value.toString().length < 2) {
return `0${value}`;
} else {
return value.toString();
}
}

stop() {
// ... your code goes here
clearInterval(this.intervalId);
}

reset() {
// ... your code goes here
this.currentTime = 0;
}

split() {
// ... your code goes here
const minutes = this.computeTwoDigitNumber(this.getMinutes());
const seconds = this.computeTwoDigitNumber(this.getSeconds());
const centiseconds = this.computeTwoDigitNumber(this.getCentiseconds());

return `${minutes}:${seconds}.${centiseconds}`;
}
}
20 changes: 20 additions & 0 deletions src/chronometer.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,53 @@
class Chronometer {
constructor() {
// ... your code goes here
this.currentTime = 0;
this.intervalId = null;
}

start(printTimeCallback) {
// ... your code goes here
this.intervalId = setInterval(() => {
this.currentTime += 1;
if (printTimeCallback) {
printTimeCallback();
}
}, 1000);
}

getMinutes() {
// ... your code goes here
return Math.floor(this.currentTime / 60);
}

getSeconds() {
// ... your code goes here
return Math.floor(this.currentTime % 60);
}

computeTwoDigitNumber(value) {
// ... your code goes here
if (value.toString().length < 2) {
return `0${value}`;
} else {
return value.toString();
}
}

stop() {
// ... your code goes here
clearInterval(this.intervalId);
}

reset() {
// ... your code goes here
this.currentTime = 0;
}

split() {
// ... your code goes here
const minutes = this.computeTwoDigitNumber(this.getMinutes());
const seconds = this.computeTwoDigitNumber(this.getSeconds());
return `${minutes}:${seconds}`;
}
}