Skip to content

Commit 0c4adab

Browse files
authored
Merge pull request #1 from iliakan/master
sync with upsteam
2 parents fb99525 + dac2e71 commit 0c4adab

File tree

54 files changed

+96
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+96
-86
lines changed

Diff for: 1-js/01-getting-started/1-intro/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Different engines have different "codenames", for example:
3030

3131
The terms above are good to remember, because they are used in developer articles on the internet. We'll use them too. For instance, if "a feature X is supported by V8", then it probably works in Chrome and Opera.
3232

33-
```smart header="How engines work?"
33+
```smart header="How do engines work?"
3434
3535
Engines are complicated. But the basics are easy.
3636

Diff for: 1-js/02-first-steps/01-hello-world/article.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The `<script>` tag has a few attributes that are rarely used nowadays, but we ca
4747

4848
The `type` attribute: <code>&lt;script <u>type</u>=...&gt;</code>
4949

50-
: The old standard HTML4 required a script to have a type. Usually it was `type="text/javascript"`. The modern HTML standard assumes this `type` by default. No attribute is required.
50+
: The old standard HTML4 required a script to have a type. Usually it was `type="text/javascript"`. It's not required any more. Also, the modern standard totally changed the meaning of this attribute. Now it can be used for Javascript modules. But that's an advanced topic, but we'll talk about modules later in another part of the tutorial.
5151

5252
The `language` attribute: <code>&lt;script <u>language</u>=...&gt;</code>
5353
: This attribute was meant to show the language of the script. As of now, this attribute makes no sense, the language is JavaScript by default. No need to use it.
@@ -61,7 +61,7 @@ Comments before and after scripts.
6161
//--></script>
6262
```
6363

64-
These comments were supposed to hide the code from an old browser that didn't know about a `<script>` tag. But all browsers born in the past 15+ years don't have any issues. We mention it here, because such comments serve as a sign. If you see that somewhere -- that code is probably really old and not worth looking into.
64+
This trick isn't used in modern JavaScript. These comments were used to hide the JavaScript code from old browsers that didn't know about a `<script>` tag. Since browsers born in the last 15 years don't have this issue, this kind of comment can help you identify really old code.
6565

6666

6767
## External scripts

Diff for: 1-js/02-first-steps/04-variables/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ const myBirthday = '18.04.1982';
247247
myBirthday = '01.01.2001'; // error, can't reassign the constant!
248248
```
249249
250-
When a programmer is sure that the variable should never change, he can use `const` to guarantee it, and also to clearly show that fact to everyone.
250+
When a programmer is sure that the variable should never change, they can use `const` to guarantee it, and also to clearly show that fact to everyone.
251251
252252
253253
### Uppercase constants

Diff for: 1-js/02-first-steps/08-comparison/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Yeah, mathematically that's strange. The last result states that "`null` is grea
176176

177177
The reason is that an equality check `==` and comparisons `> < >= <=` work differently. Comparisons convert `null` to a number, hence treat it as `0`. That's why (3) `null >= 0` is true and (1) `null > 0` is false.
178178

179-
On the other hand, the equality check `==` for `undefined` and `null` works by the rule, without any conversions. They equal each other and don't equal anything else. That's why (2) `null == 0` is false.
179+
On the other hand, the equality check `==` for `undefined` and `null` is defined such that, without any conversions, they equal each other and don't equal anything else. That's why (2) `null == 0` is false.
180180

181181
### An incomparable undefined
182182

Diff for: 1-js/02-first-steps/11-logical-operators/article.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,10 @@ When all values are truthy, the last value is returned:
230230
alert( 1 && 2 && 3 ); // 3, the last one
231231
```
232232
233-
````smart header="AND `&&` executes before OR `||`"
234-
The precedence of the AND `&&` operator is higher than OR `||`, so it executes before OR.
233+
````smart header="Precedence of AND `&&` is higher than OR `||`"
234+
The precedence of AND `&&` operator is higher than OR `||`.
235235
236-
In the code below `1 && 0` is calculated first:
237-
238-
```js run
239-
alert( 5 || 1 && 0 ); // 5
240-
```
236+
So the code `a && b || c && d` is essentially the same as if `&&` were in parentheses: `(a && b) || (c && d)`.
241237
````
242238
243239
Just like OR, the AND `&&` operator can sometimes replace `if`.
@@ -303,3 +299,5 @@ There's a little more verbose way to do the same thing -- a built-in `Boolean` f
303299
alert( Boolean("non-empty string") ); // true
304300
alert( Boolean(null) ); // false
305301
```
302+
303+
The precedence of NOT `!` is the highest of all bitwise operators, so it always executes first, before any `&&`, `||`.

Diff for: 1-js/02-first-steps/12-while-for/6-repeat-until-correct/task.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ importance: 5
44

55
# Repeat until the input is correct
66

7-
Write a loop which prompts for a number greater than `100`. If the visitor enters another number -- ask him to input again.
7+
Write a loop which prompts for a number greater than `100`. If the visitor enters another number -- ask them to input again.
88

99
The loop must ask for a number until either the visitor enters a number greater than `100` or cancels the input/enters an empty line.
1010

Diff for: 1-js/02-first-steps/16-javascript-specials/article.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ More in: <info:variables> and <info:types>.
103103
We're using a browser as a working environment, so basic UI functions will be:
104104

105105
[`prompt(question[, default])`](mdn:api/Window/prompt)
106-
: Ask a `question`, and return either what the visitor entered or `null` if he pressed "cancel".
106+
: Ask a `question`, and return either what the visitor entered or `null` if they pressed "cancel".
107107

108108
[`confirm(question)`](mdn:api/Window/confirm)
109109
: Ask a `question` and suggest to choose between Ok and Cancel. The choice is returned as `true/false`.
110110

111111
[`alert(message)`](mdn:api/Window/alert)
112112
: Output a `message`.
113113

114-
All these functions are *modal*, they pause the code execution and prevent the visitor from interacting with the page until he answers.
114+
All these functions are *modal*, they pause the code execution and prevent the visitor from interacting with the page until they answer.
115115

116116
For instance:
117117

Diff for: 1-js/03-code-quality/03-comments/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Any subtle features of the code? Where they are used?
162162

163163
## Summary
164164

165-
An important sign of a good developer is comments: their presence and even their absense.
165+
An important sign of a good developer is comments: their presence and even their absence.
166166

167167
Good comments allow us to maintain the code well, come back to it after a delay and use it more effectively.
168168

Diff for: 1-js/03-code-quality/04-ninja-code/article.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ i = i ? i < 0 ? Math.max(0, len + i) : i : 0;
3434

3535
Cool, right? If you write like that, the developer who comes across this line and tries to understand what is the value of `i` is going to have a merry time. Then come to you, seeking for an answer.
3636

37-
Tell him that shorter is always better. Initiate him into the paths of ninja.
37+
Tell them that shorter is always better. Initiate them into the paths of ninja.
3838

3939
## One-letter variables
4040

@@ -45,11 +45,11 @@ completed.
4545

4646
Another way to code faster is to use single-letter variable names everywhere. Like `a`, `b` or `c`.
4747

48-
A short variable disappears in the code like a real ninja in the forest. No one will be able to find it using "search" of the editor. And even if someone does, he won't be able to "decipher" what the name `a` or `b` means.
48+
A short variable disappears in the code like a real ninja in the forest. No one will be able to find it using "search" of the editor. And even if someone does, they won't be able to "decipher" what the name `a` or `b` means.
4949

5050
...But there's an exception. A real ninja will never use `i` as the counter in a `"for"` loop. Anywhere, but not here. Look around, there are many more exotic letters. For instance, `x` or `y`.
5151

52-
An exotic variable as a loop counter is especially cool if the loop body takes 1-2 pages (make it longer if you can). Then if someone looks deep inside the loop, he won't be able to quickly figure out that the variable named `x` is the loop counter.
52+
An exotic variable as a loop counter is especially cool if the loop body takes 1-2 pages (make it longer if you can). Then if someone looks deep inside the loop, they won't be able to quickly figure out that the variable named `x` is the loop counter.
5353

5454
## Use abbreviations
5555

@@ -153,7 +153,7 @@ function ninjaFunction(elem) {
153153
}
154154
```
155155

156-
A fellow programmer who wants to work with `elem` in the second half of the function will be surprised... Only during the debugging, after examining the code he will find out that he's working with a clone!
156+
A fellow programmer who wants to work with `elem` in the second half of the function will be surprised... Only during the debugging, after examining the code they will find out that he's working with a clone!
157157

158158
Deadly effective even against an experienced ninja. Seen in code regularly.
159159

@@ -204,7 +204,7 @@ There are functions that look like they don't change anything. Like `isReady()`,
204204

205205
**A really beautiful trick is to add a "useful" action to them, besides the main task.**
206206

207-
The expression of dazed surprise on the face of your colleague when he sees a function named `is..`, `check..` or `find...` changing something -- will definitely broaden your boundaries of reason.
207+
The expression of dazed surprise on the face of your colleague when they see a function named `is..`, `check..` or `find...` changing something -- will definitely broaden your boundaries of reason.
208208

209209
**Another way to surprise is to return a non-standard result.**
210210

@@ -228,7 +228,7 @@ Additional actions should not be obvious from the function name. A true ninja co
228228

229229
**Joining several actions into one protects your code from reuse.**
230230

231-
Imagine, another developer wants only to check the email, and not output any message. Your function `validateEmail(email)` that does both will not suit him. So he won't break your meditation by asking anything about it.
231+
Imagine, another developer wants only to check the email, and not output any message. Your function `validateEmail(email)` that does both will not suit them. So they won't break your meditation by asking anything about it.
232232

233233
## Summary
234234

Diff for: 1-js/03-code-quality/06-polyfills/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Here Babel comes to the rescue.
1919

2020
Actually, there are two parts in Babel:
2121

22-
1. First, the transpiler program, which rewrites the code. The developer runs it on his own computer. It rewrites the code into the older standard. And then the code is delivered to the website for users. Modern project build system like [webpack](http://webpack.github.io/) or [brunch](http://brunch.io/) provide means to run transpiler automatically on every code change, so that doesn't involve any time loss from our side.
22+
1. First, the transpiler program, which rewrites the code. The developer runs it on their own computer. It rewrites the code into the older standard. And then the code is delivered to the website for users. Modern project build system like [webpack](http://webpack.github.io/) or [brunch](http://brunch.io/) provide means to run transpiler automatically on every code change, so that doesn't involve any time loss from our side.
2323

2424
2. Second, the polyfill.
2525

Diff for: 1-js/04-object-basics/01-object/article.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ That can become a source of bugs and even vulnerabilies if we intent to store ar
224224
225225
In that case the visitor may choose "__proto__" as the key, and the assignment logic will be ruined (as shown above).
226226
227-
There is a way to make objects treat `__proto__` as a regular property, which we'll cover later, but first we need to know more about objects.
227+
There is a way to make objects treat `__proto__` as a regular property, which we'll cover later, but first we need to know more about objects.
228228
There's also another data structure [Map](info:map-set-weakmap-weakset), that we'll learn in the chapter <info:map-set-weakmap-weakset>, which supports arbitrary keys.
229229
````
230230

@@ -701,7 +701,7 @@ alert(clone.sizes.width); // 51, see the result from the other one
701701
702702
To fix that, we should use the cloning loop that examines each value of `user[key]` and, if it's an object, then replicate its structure as well. That is called a "deep cloning".
703703
704-
There's a standard algorithm for deep cloning that handles the case above and more complex cases, called the [Structured cloning algorithm](https://w3c.github.io/html/infrastructure.html#internal-structured-cloning-algorithm). In order not to reinvent the wheel, we can use a working implementation of it from the JavaScript library [lodash](https://lodash.com), the method is called [_.cloneDeep(obj)](https://lodash.com/docs#cloneDeep).
704+
There's a standard algorithm for deep cloning that handles the case above and more complex cases, called the [Structured cloning algorithm](http://w3c.github.io/html/infrastructure.html#safe-passing-of-structured-data). In order not to reinvent the wheel, we can use a working implementation of it from the JavaScript library [lodash](https://lodash.com), the method is called [_.cloneDeep(obj)](https://lodash.com/docs#cloneDeep).
705705
706706
707707

Diff for: 1-js/04-object-basics/04-object-methods/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ The result of a property access `user.hi` is not a function, but a value of Refe
312312
(user, "hi", true)
313313
```
314314

315-
When parentheses `()` are called on the Reference Type, they receive the full information about the object and it's method, and can set the right `this` (`=user` in this case).
315+
When parentheses `()` are called on the Reference Type, they receive the full information about the object and its method, and can set the right `this` (`=user` in this case).
316316

317317
Any other operation like assignment `hi = user.hi` discards the reference type as a whole, takes the value of `user.hi` (a function) and passes it on. So any further operation "loses" `this`.
318318

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

+14-4
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ The constructor can't be called again, because it is not saved anywhere, just cr
8585

8686
## Dual-syntax constructors: new.target
8787

88+
```smart header="Advanced stuff"
89+
The syntax from this section is rarely used, skip it unless you want to know everything.
90+
```
91+
8892
Inside a function, we can check whether it was called with `new` or without it, using a special `new.target` property.
8993

9094
It is empty for regular calls and equals the function if called with `new`:
@@ -94,14 +98,18 @@ function User() {
9498
alert(new.target);
9599
}
96100

97-
// without new:
101+
// without "new":
102+
*!*
98103
User(); // undefined
104+
*/!*
99105

100-
// with new:
106+
// with "new":
107+
*!*
101108
new User(); // function User { ... }
109+
*/!*
102110
```
103111

104-
That can be used to allow both `new` and regular syntax to work the same:
112+
That can be used to allow both `new` and regular calls to work the same. That is, create the same object:
105113

106114
```js run
107115
function User(name) {
@@ -116,7 +124,9 @@ let john = User("John"); // redirects call to new User
116124
alert(john.name); // John
117125
```
118126

119-
This approach is sometimes used in libraries to make the syntax more flexible. Probably not a good thing to use everywhere though, because omitting `new` makes it a bit less obvious what's going on. With `new` we all know that the new object is being created, that's a good thing.
127+
This approach is sometimes used in libraries to make the syntax more flexible. So that people may call the function with or without `new`, and it still works.
128+
129+
Probably not a good thing to use everywhere though, because omitting `new` makes it a bit less obvious what's going on. With `new` we all know that the new object is being created.
120130

121131
## Return from constructors
122132

Diff for: 1-js/05-data-types/01-primitives-methods/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
JavaScript allows us to work with primitives (strings, numbers etc) as if they were objects.
44

5-
They also provide methods to call and such. We will study those soon, but first we'll see how it works, because, of course, primitives are not objects (and here we will make it even more clear).
5+
They also provide methods to call as such. We will study those soon, but first we'll see how it works, because, of course, primitives are not objects (and here we will make it even more clear).
66

77
Let's look at the key distinction between primitives and objects.
88

Diff for: 1-js/05-data-types/02-number/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Strange! What is it then if not `0.3`?
201201
alert( 0.1 + 0.2 ); // 0.30000000000000004
202202
```
203203

204-
Ouch! There are more consequences than an incorrect comparison here. Imagine you're making an e-shopping site and the visitor puts `$0.10` and `$0.20` goods into his chart. The order total will be `$0.30000000000000004`. That would surprise anyone.
204+
Ouch! There are more consequences than an incorrect comparison here. Imagine you're making an e-shopping site and the visitor puts `$0.10` and `$0.20` goods into their chart. The order total will be `$0.30000000000000004`. That would surprise anyone.
205205

206206
But why does this happen?
207207

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ Let's recap these methods to avoid any confusion:
451451
```smart header="Which one to choose?"
452452
All of them can do the job. Formally, `substr` has a minor drawback: it is described not in the core JavaScript specification, but in Annex B, which covers browser-only features that exist mainly for historical reasons. So, non-browser environments may fail to support it. But in practice it works everywhere.
453453
454-
The author finds himself using `slice` almost all the time.
454+
The author finds themself using `slice` almost all the time.
455455
```
456456

457457
## Comparing strings

Diff for: 1-js/04-object-basics/06-constructor-new/4-calculator-extendable/task.md renamed to 1-js/05-data-types/04-array/6-calculator-extendable/task.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The task consists of two parts.
1717

1818
alert( calc.calculate("3 + 7") ); // 10
1919
```
20-
2. Then add the method `addOperator(name, func)` that teaches the calculator a new operation. It takes the operator `name` and the two-argument function `func(a,b)` that implements it.
20+
2. Then add the method `addMethod(name, func)` that teaches the calculator a new operation. It takes the operator `name` and the two-argument function `func(a,b)` that implements it.
2121

2222
For instance, let's add the multiplication `*`, division `/` and power `**`:
2323

Diff for: 1-js/05-data-types/04-array/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ It's rarely used, because square brackets `[]` are shorter. Also there's a trick
369369

370370
If `new Array` is called with a single argument which is a number, then it creates an array *without items, but with the given length*.
371371

372-
Let's see how one can shoot himself in the foot:
372+
Let's see how one can shoot themself in the foot:
373373

374374
```js run
375375
let arr = new Array(2); // will it create an array of [2] ?

Diff for: 1-js/05-data-types/05-array-methods/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ alert(arr); // *!*1, 2, 15*/!*
417417
````
418418

419419
````smart header="Arrow functions for the best"
420-
Remember [arrow functions](info:function-expression#arrow-functions)? We can use them here for neater sorting:
420+
Remember [arrow functions](info:function-expressions-arrows#arrow-functions)? We can use them here for neater sorting:
421421
422422
```js
423423
arr.sort( (a, b) => a - b );

Diff for: 1-js/05-data-types/07-map-set-weakmap-weakset/article.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ For instance:
4747
```js run
4848
let john = { name: "John" };
4949

50-
// for every user, let's store his visits count
50+
// for every user, let's store their visits count
5151
let visitsCountMap = new Map();
5252

5353
// john is the key for the map
@@ -332,7 +332,7 @@ That's useful for situations when we have a main storage for the objects somewhe
332332
333333
Let's look at an example.
334334
335-
For instance, we have code that keeps a visit count for each user. The information is stored in a map: a user is the key and the visit count is the value. When a user leaves, we don't want to store his visit count anymore.
335+
For instance, we have code that keeps a visit count for each user. The information is stored in a map: a user is the key and the visit count is the value. When a user leaves, we don't want to store their visit count anymore.
336336
337337
One way would be to keep track of leaving users and clean up the storage manually:
338338

Diff for: 1-js/06-advanced-functions/03-closure/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ The execution flow of the code above:
175175

176176
1. The global Lexical Environment has `name: "John"`.
177177
2. At the line `(*)` the global variable is changed, now it has `name: "Pete"`.
178-
3. When the function `say()`, is executed and takes `name` from outside. Here that's from the global Lexical Environment where it's already `"Pete"`.
178+
3. When the function `sayHi()`, is executed and takes `name` from outside. Here that's from the global Lexical Environment where it's already `"Pete"`.
179179

180180

181181
```smart header="One call -- one Lexical Environment"
Loading
-390 Bytes
Loading

Diff for: 1-js/06-advanced-functions/08-settimeout-setinterval/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ We do a part of the job `(*)`:
319319
2. Second run: `i=1000001..2000000`.
320320
3. ...and so on, the `while` checks if `i` is evenly divided by `1000000`.
321321

322-
Then the next call is scheduled in `(*)` if we're not done yet.
322+
Then the next call is scheduled in `(**)` if we're not done yet.
323323

324324
Pauses between `count` executions provide just enough "breath" for the JavaScript engine to do something else, to react to other user actions.
325325

0 commit comments

Comments
 (0)