Skip to content

Commit 1889fd8

Browse files
authored
Merge pull request #582 from evazorro/patch-1
Update wording and grammar
2 parents 6be46c1 + 1ffbae4 commit 1889fd8

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ 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"`. 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.
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; 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>
53-
: 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.
53+
: This attribute was meant to show the language of the script. This attribute no longer makes sense, because JavaScript is the default language. No need to use it.
5454

5555
Comments before and after scripts.
5656
: In really ancient books and guides, one may find comments inside `<script>`, like this:
@@ -61,7 +61,7 @@ Comments before and after scripts.
6161
//--></script>
6262
```
6363

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.
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 released 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
@@ -78,7 +78,7 @@ Here `/path/to/script.js` is an absolute path to the file with the script (from
7878

7979
It is also possible to provide a path relative to the current page. For instance, `src="script.js"` would mean a file `"script.js"` in the current folder.
8080

81-
We can give a full URL as well, for instance:
81+
We can give a full URL as well. For instance:
8282

8383
```html
8484
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.2.0/lodash.js"></script>

1-js/02-first-steps/14-function-basics/article.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ function checkAge(age) {
263263
*/!*
264264
} else {
265265
*!*
266-
return confirm('Got a permission from the parents?');
266+
return confirm('Do you have permission from your parents?');
267267
*/!*
268268
}
269269
}
@@ -334,7 +334,7 @@ So, it effectively becomes an empty return. We should put the value on the same
334334
335335
## Naming a function [#function-naming]
336336
337-
Functions are actions. So their name is usually a verb. It should briefly, but as accurately as possible describe what the function does. So that a person who reads the code gets the right clue.
337+
Functions are actions. So their name is usually a verb. It should briefly, but as accurately as possible, describe what the function does, so that someone reading the code gets an indication of what the function does.
338338
339339
It is a widespread practice to start a function with a verbal prefix which vaguely describes the action. There must be an agreement within the team on the meaning of the prefixes.
340340

1-js/02-first-steps/15-function-expressions-arrows/article.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ let func = sayHi;
7878
Everything would work the same. Even more obvious what's going on, right?
7979

8080

81-
````smart header="Why there's a semicolon at the end?"
82-
There might be a question, why does Function Expression have a semicolon `;` at the end, and Function Declaration does not:
81+
````smart header="Why is there a semicolon at the end?"
82+
You might wonder, why does Function Expression have a semicolon `;` at the end, but Function Declaration does not:
8383
8484
```js
8585
function sayHi() {
@@ -198,7 +198,7 @@ The more subtle difference is *when* a function is created by the JavaScript eng
198198

199199
**A Function Expression is created when the execution reaches it and is usable from then on.**
200200

201-
Once the execution flow passes to the right side of the assignment `let sum = function…` -- here we go, the function is created and can be used (assigned, called etc) from now on.
201+
Once the execution flow passes to the right side of the assignment `let sum = function…` -- here we go, the function is created and can be used (assigned, called, etc. ) from now on.
202202

203203
Function Declarations are different.
204204

@@ -350,7 +350,7 @@ welcome(); // ok now
350350
```
351351

352352

353-
```smart header="When to choose Function Declaration versus Function Expression?"
353+
```smart header="When should you choose Function Declaration versus Function Expression?"
354354
As a rule of thumb, when we need to declare a function, the first to consider is Function Declaration syntax, the one we used before. It gives more freedom in how to organize our code, because we can call such functions before they are declared.
355355
356356
It's also a little bit easier to look up `function f(…) {…}` in the code than `let f = function(…) {…}`. Function Declarations are more "eye-catching".

0 commit comments

Comments
 (0)