Skip to content

Commit 9876c71

Browse files
committed
Merge branch 'master' of github.com:javascript-tutorial/en.javascript.info into sync-ff804bc1
2 parents 0ae0a17 + ff804bc commit 9876c71

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ let userName;
172172
let test123;
173173
```
174174

175-
When the name contains multiple words, [camelCase](https://en.wikipedia.org/wiki/CamelCase) is commonly used. That is: words go one after another, each word except first starting with a capital letter: `myVeryLongName`.
175+
When the name contains multiple words, [camelCase](https://en.wikipedia.org/wiki/CamelCase) is commonly used. That is: words go one after another, with each word except the first starting with a capital letter: `myVeryLongName`.
176176

177177
What's interesting -- the dollar sign `'$'` and the underscore `'_'` can also be used in names. They are regular symbols, just like letters, without any special meaning.
178178

1-js/02-first-steps/08-operators/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ alert( c ); // 4
266266

267267
Chained assignments evaluate from right to left. First, the rightmost expression `2 + 2` is evaluated and then assigned to the variables on the left: `c`, `b` and `a`. At the end, all the variables share a single value.
268268

269-
Once again, for the purposes of readability it's better to split such code into few lines:
269+
Once again, for the purposes of readability it's better to split such code into a few lines:
270270
271271
```js
272272
c = 2 + 2;

1-js/03-code-quality/02-coding-style/1-style-errors/solution.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ You could note the following:
33

44
```js no-beautify
55
function pow(x,n) // <- no space between arguments
6-
{ // <- figure bracket on a separate line
6+
{ // <- curly brace on a separate line
77
let result=1; // <- no spaces before or after =
88
for(let i=0;i<n;i++) {result*=x;} // <- no spaces
99
// the contents of { ... } should be on a new line
@@ -13,7 +13,7 @@ function pow(x,n) // <- no space between arguments
1313
let x=prompt("x?",''), n=prompt("n?",'') // <-- technically possible,
1414
// but better make it 2 lines, also there's no spaces and missing ;
1515
if (n<=0) // <- no spaces inside (n <= 0), and should be extra line above it
16-
{ // <- figure bracket on a separate line
16+
{ // <- curly brace on a separate line
1717
// below - long lines can be split into multiple lines for improved readability
1818
alert(`Power ${n} is not supported, please enter an integer number greater than zero`);
1919
}

1-js/04-object-basics/01-object/article.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ As we know from the chapter <info:types>, there are eight data types in JavaScri
55

66
In contrast, objects are used to store keyed collections of various data and more complex entities. In JavaScript, objects penetrate almost every aspect of the language. So we must understand them first before going in-depth anywhere else.
77

8-
An object can be created with figure brackets `{…}` with an optional list of *properties*. A property is a "key: value" pair, where `key` is a string (also called a "property name"), and `value` can be anything.
8+
An object can be created with curly braces `{…}` with an optional list of *properties*. A property is a "key: value" pair, where `key` is a string (also called a "property name"), and `value` can be anything.
99

1010
We can imagine an object as a cabinet with signed files. Every piece of data is stored in its file by the key. It's easy to find a file by its name or add/remove a file.
1111

@@ -20,7 +20,7 @@ let user = {}; // "object literal" syntax
2020

2121
![](object-user-empty.svg)
2222

23-
Usually, the figure brackets `{...}` are used. That declaration is called an *object literal*.
23+
Usually, the curly braces `{...}` are used. That declaration is called an *object literal*.
2424

2525
## Literals and properties
2626

1-js/05-data-types/10-destructuring-assignment/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ That works, because internally a destructuring assignment works by iterating ove
8080
````
8181

8282

83-
````smart header="Assign to anything at the left-side"
83+
````smart header="Assign to anything on the left-side"
8484
We can use any "assignables" on the left side.
8585
8686
For instance, an object property:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ And here is the picture for the nested `setTimeout`:
218218

219219
![](settimeout-interval.svg)
220220

221-
**The nested `setTimeout` guarantees the fixed delay (here 100ms).**
221+
**The nested `setTimeout` ensures a minimum delay (100ms here) between the end of one call and the beginning of the subsequent one.**
222222

223223
That's because a new call is planned at the end of the previous one.
224224

0 commit comments

Comments
 (0)