Skip to content

Commit 7efbc5a

Browse files
authored
Merge branch 'master' into patch-4
2 parents d61a8bd + 0bbec29 commit 7efbc5a

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

1-js/03-code-quality/01-debugging-chrome/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Please open the informational dropdowns to the right (labeled with arrows). They
101101

102102
1. **`Watch` -- shows current values for any expressions.**
103103

104-
You can click the plus `+` and input an expression. The debugger will shown its value at any moment, automatically recalculating it in in the process of execution.
104+
You can click the plus `+` and input an expression. The debugger will show its value at any moment, automatically recalculating it in in the process of execution.
105105

106106
2. **`Call Stack` -- shows the nested calls chain.**
107107

1-js/05-data-types/03-string/article.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ alert( str.indexOf("id") ); // 1, "id" is found at the position 1 (..idget with
236236

237237
The optional second parameter allows us to search starting from the given position.
238238

239-
For instance, the first occurence of `"id"` is at position `1`. To look for the next occurence, let's start the search from position `2`:
239+
For instance, the first occurence of `"id"` is at position `1`. To look for the next occurence, let's start the search from position `2`:
240240

241241
```js run
242242
let str = 'Widget with id';
@@ -245,7 +245,7 @@ alert( str.indexOf('id', 2) ) // 12
245245
```
246246

247247

248-
If we're interested in all occurences, we can run `indexOf` in a loop. Every new call is made with the position after the previous match:
248+
If we're interested in all occurrences, we can run `indexOf` in a loop. Every new call is made with the position after the previous match:
249249

250250

251251
```js run

1-js/05-data-types/05-array-methods/10-average-age/solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
```js run
22
function getAverageAge(users) {
3-
return arr.reduce((prev, user) => prev + user.age, 0) / arr.length;
3+
return users.reduce((prev, user) => prev + user.age, 0) / users.length;
44
}
55

66
let john = { name: "John", age: 25 }

2-ui/1-document/08-styles-and-classes/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,4 +301,4 @@ To change the styles:
301301

302302
To read the resolved styles (with respect to all classes, after all CSS is applied and final values are calculated):
303303

304-
- The `getComputedStyles(elem[, pseudo])` returns the style-like object with them. Read-only.
304+
- The `getComputedStyle(elem[, pseudo])` returns the style-like object with them. Read-only.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
The solution is actually pretty simple:
22

33
- Use `position:absolute` in CSS instead of `position:fixed` for `.note`.
4-
- Usee the function [getCoords()](info:coordinates#getCoords) from the chapter <info:coordinates> to get document-relative coordinates.
4+
- Use the function [getCoords()](info:coordinates#getCoords) from the chapter <info:coordinates> to get document-relative coordinates.

3-animation/3-js-animation/article.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ If we want to speed up the animation, we can use `progress` in the power `n`.
219219
For instance, a parabolic curve:
220220

221221
```js
222-
function quad(progress) {
223-
return Math.pow(progress, 2)
222+
function quad(timeFraction) {
223+
return Math.pow(timeFraction, 2)
224224
}
225225
```
226226

0 commit comments

Comments
 (0)