Skip to content

Commit 5b42c58

Browse files
committed
Merge branch 'master' of github.com:javascript-tutorial/en.javascript.info into sync-8c30654f
2 parents f2bff7e + 8c30654 commit 5b42c58

File tree

17 files changed

+30
-23
lines changed

17 files changed

+30
-23
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
@@ -2,7 +2,7 @@
22

33
Before writing more complex code, let's talk about debugging.
44

5-
[Debugging](https://en.wikipedia.org/wiki/Debugging) is the process of finding and fixing errors within a script. All modern browsers and most other environments support debugging tools -- a special UI in developer tools that enable debugging much easier. It also allows to trace the code step by step to see what exactly is going on.
5+
[Debugging](https://en.wikipedia.org/wiki/Debugging) is the process of finding and fixing errors within a script. All modern browsers and most other environments support debugging tools -- a special UI in developer tools that makes debugging much easier. It also allows to trace the code step by step to see what exactly is going on.
66

77
We'll be using Chrome here, because it has enough features, most other browsers have a similar process`.
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let n = prompt("n?", "");
2626
2727
if (n < 0) {
2828
alert(`Power ${n} is not supported,
29-
please enter an integer number, greater than 0`);
29+
please enter a non-negative integer number`);
3030
} else {
3131
alert( pow(x, n) );
3232
}

1-js/03-code-quality/02-coding-style/code-style.svg

Lines changed: 1 addition & 1 deletion
Loading

1-js/03-code-quality/05-testing-mocha/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Automated testing with mocha
1+
# Automated testing with Mocha
22

33
Automated testing will be used in further tasks, and it's also widely used in real projects.
44

1-js/04-object-basics/05-object-toprimitive/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ For instance:
196196
}
197197
};
198198
199-
alert(obj + 2); // 22 (ToPrimitive returned string => concatenation)
199+
alert(obj + 2); // 22 (conversion to primitive returned a string => concatenation)
200200
```
201201

202202
## Summary

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ arr.slice(start, end)
124124

125125
It returns a new array copying to it all items from index `start` to `end` (not including `end`). Both `start` and `end` can be negative, in that case position from array end is assumed.
126126

127-
It's similar to a string method `str.slice`, but instead of substringss it makes subarrays.
127+
It's similar to a string method `str.slice`, but instead of substrings it makes subarrays.
128128

129129
For instance:
130130

1-js/05-data-types/12-json/article.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,13 @@ The first call is special. It is made using a special "wrapper object": `{"": me
286286
The idea is to provide as much power for `replacer` as possible: it has a chance to analyze and replace/skip even the whole object if necessary.
287287

288288

289-
## Formatting: spacer
289+
## Formatting: space
290290

291-
The third argument of `JSON.stringify(value, replacer, spaces)` is the number of spaces to use for pretty formatting.
291+
The third argument of `JSON.stringify(value, replacer, space)` is the number of spaces to use for pretty formatting.
292292

293-
Previously, all stringified objects had no indents and extra spaces. That's fine if we want to send an object over a network. The `spacer` argument is used exclusively for a nice output.
293+
Previously, all stringified objects had no indents and extra spaces. That's fine if we want to send an object over a network. The `space` argument is used exclusively for a nice output.
294294

295-
Here `spacer = 2` tells JavaScript to show nested objects on multiple lines, with indentation of 2 spaces inside an object:
295+
Here `space = 2` tells JavaScript to show nested objects on multiple lines, with indentation of 2 spaces inside an object:
296296

297297
```js run
298298
let user = {
@@ -328,7 +328,7 @@ alert(JSON.stringify(user, null, 2));
328328
*/
329329
```
330330

331-
The `spaces` parameter is used solely for logging and nice-output purposes.
331+
The `space` parameter is used solely for logging and nice-output purposes.
332332

333333
## Custom "toJSON"
334334

1-js/09-classes/07-mixins/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,4 +205,4 @@ Some other languages like allow multiple inheritance. JavaScript does not suppor
205205

206206
We can use mixins as a way to augment a class by multiple behaviors, like event-handling as we have seen above.
207207

208-
Mixins may become a point of conflict if they occasionally overwrite existing class methods. So generally one should think well about the naming methods of a mixin, to minimize the probability of that.
208+
Mixins may become a point of conflict if they accidentally overwrite existing class methods. So generally one should think well about the naming methods of a mixin, to minimize the probability of that.

2-ui/5-loading/02-script-async-defer/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ loadScript("/article/script-async-defer/small.js");
178178

179179
## Summary
180180

181-
Both `async` and `defer` have one common thing: downloading of such scripts doesn't block page rendering. So the user can read page content and get acquanted with the page immediately.
181+
Both `async` and `defer` have one common thing: downloading of such scripts doesn't block page rendering. So the user can read page content and get acquainted with the page immediately.
182182

183183
But there are also essential differences between them:
184184

0 commit comments

Comments
 (0)