Skip to content

Commit 9baeccf

Browse files
committed
Merge remote-tracking branch 'wesbos/master' into flavours
2 parents c0c8092 + 2b9e008 commit 9baeccf

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

04 - Array Cardio Day 1/index-FINISHED.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
// 7. sort Exercise
8282
// Sort the people alphabetically by last name
8383
const alpha = people.sort((lastOne, nextOne) => {
84-
const [aFirst, aLast] = lastOne.split(', ');
85-
const [bFirst, bLast] = nextOne.split(', ');
84+
const [aLast, aFirst] = lastOne.split(', ');
85+
const [bLast, bFirst] = nextOne.split(', ');
8686
return aLast > bLast ? 1 : -1;
8787
});
8888
console.log(alpha);

07 - Array Cardio Day 2/index-START.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
];
2626

2727
// Some and Every Checks
28-
// Array.prototype.some() // is at least one person 19?
29-
// Array.prototype.every() // is everyone 19?
28+
// Array.prototype.some() // is at least one person 19 or older?
29+
// Array.prototype.every() // is everyone 19 or older?
3030

3131
// Array.prototype.find()
3232
// Find is like filter, but instead returns just the one you are looking for

11 - Custom Video Player/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="progress__filled"></div>
1616
</div>
1717
<button class="player__button toggle" title="Toggle Play"></button>
18-
<input type="range" name="volume" class="player__slider" min=0 max="1" step="0.05" value="1">
18+
<input type="range" name="volume" class="player__slider" min="0" max="1" step="0.05" value="1">
1919
<input type="range" name="playbackRate" class="player__slider" min="0.5" max="2" step="0.1" value="1">
2020
<button data-skip="-10" class="player__button">« 10s</button>
2121
<button data-skip="25" class="player__button">25s »</button>

21 - Geolocation/index-START.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@ <h1 class="speed">
5757
/*Compass: https://thenounproject.com/search/?q=compass&i=592352*/
5858
</style>
5959
<script>
60-
const arrow = document.querySelector('.arrow');
61-
const speed = document.querySelector('.speed-value');
62-
63-
navigator.geolocation.watchPosition((data) => {
64-
console.log(data);
65-
speed.textContent = data.coords.speed;
66-
arrow.style.transform = `rotate(${data.coords.heading}deg)`;
67-
}, (err) => {
68-
console.err(err);
69-
alert('HEY! YOU GOTTA ALLOW THAT TO HAPPEN!!!');
70-
});
71-
7260
</script>
7361
</body>
7462
</html>

0 commit comments

Comments
 (0)