Skip to content

Commit ab0f35b

Browse files
authored
Merge branch 'master' into fix/operator-precedence
2 parents 041bbb2 + 00bfa6d commit ab0f35b

File tree

24 files changed

+31
-31
lines changed

24 files changed

+31
-31
lines changed

1-js/04-object-basics/06-constructor-new/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Constructor, operator "new"
22

3-
The regular `{...}` syntax allows to create one object. But often we need to create many similar objects, like multiple users or menu items and so on.
3+
The regular `{...}` syntax allows us to create one object. But often we need to create many similar objects, like multiple users or menu items and so on.
44

55
That can be done using constructor functions and the `"new"` operator.
66

1-js/05-data-types/06-iterable/article.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To make the `range` object iterable (and thus let `for..of` work) we need to add
3131
1. When `for..of` starts, it calls that method once (or errors if not found). The method must return an *iterator* -- an object with the method `next`.
3232
2. Onward, `for..of` works *only with that returned object*.
3333
3. When `for..of` wants the next value, it calls `next()` on that object.
34-
4. The result of `next()` must have the form `{done: Boolean, value: any}`, where `done=true` means that the iteration is finished, otherwise `value` is the next value.
34+
4. The result of `next()` must have the form `{done: Boolean, value: any}`, where `done=true` means that the loop is finished, otherwise `value` is the next value.
3535

3636
Here's the full implementation for `range` with remarks:
3737

@@ -45,10 +45,10 @@ let range = {
4545
range[Symbol.iterator] = function() {
4646

4747
// ...it returns the iterator object:
48-
// 2. Onward, for..of works only with this iterator, asking it for next values
48+
// 2. Onward, for..of works only with the iterator object below, asking it for next values
4949
return {
5050
current: this.from,
51-
last: this.to,
51+
last: this.to,
5252

5353
// 3. next() is called on each iteration by the for..of loop
5454
next() {
@@ -270,7 +270,7 @@ for (let char of str) {
270270
alert(chars);
271271
```
272272

273-
...But it is shorter.
273+
...But it is shorter.
274274

275275
We can even build surrogate-aware `slice` on it:
276276

1-js/05-data-types/10-destructuring-assignment/destructuring-complex.svg

Lines changed: 1 addition & 1 deletion
Loading

1-js/06-advanced-functions/01-recursion/recursive-salaries.svg

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

1-js/07-object-properties/01-property-descriptors/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ for (let key in user) {
318318

319319
...But that does not copy flags. So if we want a "better" clone then `Object.defineProperties` is preferred.
320320

321-
Another difference is that `for..in` ignores symbolic properties, but `Object.getOwnPropertyDescriptors` returns *all* property descriptors including symbolic ones.
321+
Another difference is that `for..in` ignores symbolic and non-enumerable properties, but `Object.getOwnPropertyDescriptors` returns *all* property descriptors including symbolic and non-enumerable ones.
322322

323323
## Sealing an object globally
324324

1-js/11-async/01-callbacks/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,4 +307,4 @@ Also, the functions named `step*` are all of single use, they are created only t
307307

308308
We'd like to have something better.
309309

310-
Luckily, there are other ways to avoid such pyramids. One of the best ways is to use "promises," described in the next chapter.
310+
Luckily, there are other ways to avoid such pyramids. One of the best ways is to use "promises", described in the next chapter.
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

1-js/12-generators-iterators/1-generators/generateSequence-2.svg

Lines changed: 1 addition & 1 deletion
Loading

1-js/12-generators-iterators/1-generators/generateSequence-3.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)