Skip to content

Commit b6090f3

Browse files
committed
Merge branch 'master' of github.com:javascript-tutorial/en.javascript.info into sync-e2f9e584
2 parents aa3f2cd + e2f9e58 commit b6090f3

6 files changed

Lines changed: 10 additions & 9 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Google Chrome ist in der Regel mit Sprachfunktionen auf dem neuesten Stand und e
8686
=======
8787
Speaking of names, [Babel](https://babeljs.io) is one of the most prominent transpilers out there.
8888
89-
Modern project build systems, such as [webpack](http://webpack.github.io/), provide means to run transpiler automatically on every code change, so it's very easy to integrate into development process.
89+
Modern project build systems, such as [webpack](https://webpack.js.org/), provide means to run transpiler automatically on every code change, so it's very easy to integrate into development process.
9090
9191
## Polyfills
9292
@@ -126,7 +126,7 @@ In this chapter we'd like to motivate you to study modern and even "bleeding-edg
126126
127127
Just don't forget to use transpiler (if using modern syntax or operators) and polyfills (to add functions that may be missing). And they'll ensure that the code works.
128128
129-
For example, later when you're familiar with JavaScript, you can setup a code build system based on [webpack](http://webpack.github.io/) with [babel-loader](https://github.com/babel/babel-loader) plugin.
129+
For example, later when you're familiar with JavaScript, you can setup a code build system based on [webpack](https://webpack.js.org/) with [babel-loader](https://github.com/babel/babel-loader) plugin.
130130
131131
Good resources that show the current state of support for various features:
132132
- <https://kangax.github.io/compat-table/es6/> - for pure JavaScript.

1-js/05-data-types/05-array-methods/3-filter-range-in-place/_js.view/test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ describe("filterRangeInPlace", function() {
44

55
let arr = [5, 3, 8, 1];
66

7-
filterRangeInPlace(arr, 1, 4);
7+
filterRangeInPlace(arr, 2, 5);
88

9-
assert.deepEqual(arr, [3, 1]);
9+
assert.deepEqual(arr, [5, 3]);
1010
});
1111

1212
it("doesn't return anything", function() {
1313
assert.isUndefined(filterRangeInPlace([1,2,3], 1, 4));
1414
});
1515

16-
});
16+
});

1-js/13-modules/01-modules-intro/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ alert(admin.name); // Pete
182182

183183
As you can see, when `1.js` changes the `name` property in the imported `admin`, then `2.js` can see the new `admin.name`.
184184

185-
That's exactly because the module is executed only once. Exports are generated, and then they are shared between importers, so if something changes the `admin` object, other modules will see that.
185+
That's exactly because the module is executed only once. Exports are generated, and then they are shared between importers, so if something changes the `admin` object, other importers will see that.
186186

187187
**Such behavior is actually very convenient, because it allows us to *configure* modules.**
188188

1-js/13-modules/02-import-export/article.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ At first sight, "import everything" seems such a cool thing, short to write, why
9393

9494
Well, there are few reasons.
9595

96-
1. Modern build tools ([webpack](http://webpack.github.io) and others) bundle modules together and optimize them to speedup loading and remove unused stuff.
96+
1. Modern build tools ([webpack](https://webpack.js.org/) and others) bundle modules together and optimize them to speedup loading and remove unused stuff.
9797

9898
Let's say, we added a 3rd-party library `say.js` to our project with many functions:
9999
```js
@@ -403,7 +403,7 @@ We can come across two problems with it:
403403

404404
2. `export * from './user.js'` re-exports only named exports, but ignores the default one.
405405

406-
If we'd like to re-export both named and the default export, then two statements are needed:
406+
If we'd like to re-export both named and default exports, then two statements are needed:
407407
```js
408408
export * from './user.js'; // to re-export named exports
409409
export {default} from './user.js'; // to re-export the default export

2-ui/4-forms-controls/1-form-elements/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Let's talk about form controls.
155155
156156
### input and textarea
157157
158-
We can access their value as `input.value` (string) or `input.checked` (boolean) for checkboxes.
158+
We can access their value as `input.value` (string) or `input.checked` (boolean) for checkboxes and radio buttons.
159159
160160
Like this:
161161

5-network/11-websocket/demo.view/server.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function accept(req, res) {
2121

2222
function onConnect(ws) {
2323
ws.on('message', function (message) {
24+
message = message.toString();
2425
let name = message.match(/([\p{Alpha}\p{M}\p{Nd}\p{Pc}\p{Join_C}]+)$/gu) || "Guest";
2526
ws.send(`Hello from server, ${name}!`);
2627

0 commit comments

Comments
 (0)