Merge pull request #53 from javascript-tutorial/sync-e2f9e584

Sync with upstream @ e2f9e58

Author: otmon76

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

@@ -204,7 +204,11 @@ Následuje výtažek z [tabulky priorit](https://developer.mozilla.org/en-US/doc
 | 2 | přiřazení | `=` |
 | ... | ... | ... |
 
+<<<<<<< HEAD
 Jak vidíme, „unární plus“ má prioritu `15`, která je vyšší než priorita `13` „sčítání“ (binární plus). To je důvod, proč se ve výrazu `"+jablka + +pomeranče"` unární plusy vyhodnotí před sčítáním.
+=======
+As we can see, the "unary plus" has a priority of `15` which is higher than the `12` of "addition" (binary plus). That's why, in the expression `"+apples + +oranges"`, unary pluses work before the addition.
+>>>>>>> e2f9e5840737e00846bfd492192d8a3828820c60
 
 ## Přiřazení
 

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

@@ -42,7 +42,11 @@ Vývojář si obvykle spustí transpiler na svém vlastním počítači a pak um
 
 Když hovoříme o názvech, jedním z nejvýznamnějších transpilerů je [Babel](https://babeljs.io).
 
+<<<<<<< HEAD
 Moderní systémy pro vytváření projektů, například [webpack](http://webpack.github.io/), poskytují způsoby, jak spouštět transpiler automaticky při každé změně kódu, takže je velmi jednoduché jej integrovat do procesu vývoje.
+=======
+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.
+>>>>>>> e2f9e5840737e00846bfd492192d8a3828820c60
 
 ## Polyfilly
 
@@ -82,7 +86,11 @@ V této kapitole jsme vás chtěli motivovat k prostudování moderních vlastno
 
 Jen nezapomínejte používat transpiler (používáte-li moderní syntaxi nebo operátory) a polyfilly (abyste přidali funkce, které mohou chybět). Ty zajistí, že váš kód bude fungovat.
 
+<<<<<<< HEAD
 Například později, až budete JavaScript dobře znát, si můžete nastavit systém pro vytváření kódu založený na [webpacku](http://webpack.github.io/) s pluginem [babel-loader](https://github.com/babel/babel-loader).
+=======
+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.
+>>>>>>> e2f9e5840737e00846bfd492192d8a3828820c60
 
 Dobré zdroje, které ukazují aktuální stav podpory různých vlastností:
 - <https://kangax.github.io/compat-table/es6/> - pro čistý JavaScript.

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

@@ -4,13 +4,19 @@ describe("filtrujPodleRozsahuNaMístě", function() {
 
     let pole = [5, 3, 8, 1];
 
+<<<<<<< HEAD
     filtrujPodleRozsahuNaMístě(pole, 1, 4); 
 
     assert.deepEqual(pole, [3, 1]);
+=======
+    filterRangeInPlace(arr, 2, 5); 
+
+    assert.deepEqual(arr, [5, 3]);
+>>>>>>> e2f9e5840737e00846bfd492192d8a3828820c60
   });
 
   it("nic nevrací", function() {
     assert.isUndefined(filtrujPodleRozsahuNaMístě([1,2,3], 1, 4)); 
   });
 
-});
+});

1-js/11-async/05-promise-api/article.md

@@ -13,10 +13,10 @@ That's what `Promise.all` is for.
 The syntax is:
 
 ```js
-let promise = Promise.all([...promises...]);
+let promise = Promise.all(iterable);
 ```
 
-`Promise.all` takes an array of promises (it technically can be any iterable, but is usually an array) and returns a new promise.
+`Promise.all` takes an iterable (usually, an array of promises) and returns a new promise.
 
 The new promise resolves when all listed promises are resolved, and the array of their results becomes its result.
 

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

@@ -182,7 +182,7 @@ alert(admin.name); // Pete
 
 As you can see, when `1.js` changes the `name` property in the imported `admin`, then `2.js` can see the new `admin.name`.
 
-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.
+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.
 
 **Such behavior is actually very convenient, because it allows us to *configure* modules.**
 

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

@@ -93,7 +93,7 @@ At first sight, "import everything" seems such a cool thing, short to write, why
 
 Well, there are few reasons.
 
-1. Modern build tools ([webpack](http://webpack.github.io) and others) bundle modules together and optimize them to speedup loading and remove unused stuff.
+1. Modern build tools ([webpack](https://webpack.js.org/) and others) bundle modules together and optimize them to speedup loading and remove unused stuff.
 
     Let's say, we added a 3rd-party library `say.js` to our project with many functions:
     ```js
@@ -403,7 +403,7 @@ We can come across two problems with it:
 
 2. `export * from './user.js'` re-exports only named exports, but ignores the default one.
 
-    If we'd like to re-export both named and the default export, then two statements are needed:
+    If we'd like to re-export both named and default exports, then two statements are needed:
     ```js
     export * from './user.js'; // to re-export named exports
     export {default} from './user.js'; // to re-export the default export

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

@@ -155,7 +155,7 @@ Let's talk about form controls.
 
 ### input and textarea
 
-We can access their value as `input.value` (string) or `input.checked` (boolean) for checkboxes.
+We can access their value as `input.value` (string) or `input.checked` (boolean) for checkboxes and radio buttons.
 
 Like this:
 

4-binary/03-blob/article.md

@@ -223,7 +223,7 @@ blob.arrayBuffer().then(buffer => /* process the ArrayBuffer */);
 
 ## From Blob to stream
 
-When we read and write to a blob of more than `2G`, the use of `arrayBuffer` becomes more memory intensive for us. At this point, we can directly convert the blob to a stream.
+When we read and write to a blob of more than `2 GB`, the use of `arrayBuffer` becomes more memory intensive for us. At this point, we can directly convert the blob to a stream.
 
 A stream is a special object that allows to read from it (or write into it) portion by portion. It's outside of our scope here, but here's an example, and you can read more at <https://developer.mozilla.org/en-US/docs/Web/API/Streams_API>. Streams are convenient for data that is suitable for processing piece-by-piece.
 

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

@@ -21,6 +21,7 @@ function accept(req, res) {
 
 function onConnect(ws) {
   ws.on('message', function (message) {
+    message = message.toString();
     let name = message.match(/([\p{Alpha}\p{M}\p{Nd}\p{Pc}\p{Join_C}]+)$/gu) || "Guest";
     ws.send(`Hello from server, ${name}!`);