From a78e9d5d2fcc7f821b06c93d2ec8b3e49258abb5 Mon Sep 17 00:00:00 2001 From: romanstetsyk <25715951+romanstetsyk@users.noreply.github.com> Date: Sat, 1 Oct 2022 19:24:44 +0100 Subject: [PATCH 01/16] Change potentially confusing statement --- 1-js/06-advanced-functions/08-settimeout-setinterval/article.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-js/06-advanced-functions/08-settimeout-setinterval/article.md b/1-js/06-advanced-functions/08-settimeout-setinterval/article.md index 5a40238b1..f5e0e3b49 100644 --- a/1-js/06-advanced-functions/08-settimeout-setinterval/article.md +++ b/1-js/06-advanced-functions/08-settimeout-setinterval/article.md @@ -218,7 +218,7 @@ And here is the picture for the nested `setTimeout`: ![](settimeout-interval.svg) -**The nested `setTimeout` guarantees the fixed delay (here 100ms).** +**The nested `setTimeout` ensures a minimum delay (100ms here) between the end of one call and the beginning of the subsequent one.** That's because a new call is planned at the end of the previous one. From 8c256ae569fc496ff28d3f73daf81f3622a6115b Mon Sep 17 00:00:00 2001 From: Nikolai Chernolutskii <93830967+nikolai-chernolutskii@users.noreply.github.com> Date: Sun, 29 Jan 2023 18:47:02 +0200 Subject: [PATCH 02/16] Update article.md Assign to anything at the left-side => Assign to anything on the left-side Need to be consistent - the previous menu item title reads "Works with any iterable on the right-side" --- 1-js/05-data-types/10-destructuring-assignment/article.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-js/05-data-types/10-destructuring-assignment/article.md b/1-js/05-data-types/10-destructuring-assignment/article.md index 41e36db2c..06886eee0 100644 --- a/1-js/05-data-types/10-destructuring-assignment/article.md +++ b/1-js/05-data-types/10-destructuring-assignment/article.md @@ -80,7 +80,7 @@ That works, because internally a destructuring assignment works by iterating ove ```` -````smart header="Assign to anything at the left-side" +````smart header="Assign to anything on the left-side" We can use any "assignables" on the left side. For instance, an object property: From 9a90dc19c865c89c6e02d6e04f541de6776ef7e9 Mon Sep 17 00:00:00 2001 From: Scott Wright <108872957+scottwright-io@users.noreply.github.com> Date: Tue, 31 Jan 2023 16:29:26 +0000 Subject: [PATCH 03/16] Fix typo Missing an 'a' from this sentence. --- 1-js/02-first-steps/08-operators/article.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-js/02-first-steps/08-operators/article.md b/1-js/02-first-steps/08-operators/article.md index d52c37a17..0c1663619 100644 --- a/1-js/02-first-steps/08-operators/article.md +++ b/1-js/02-first-steps/08-operators/article.md @@ -266,7 +266,7 @@ alert( c ); // 4 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. -Once again, for the purposes of readability it's better to split such code into few lines: +Once again, for the purposes of readability it's better to split such code into a few lines: ```js c = 2 + 2; From 55269bb3bb115aa2829334652292f521d8b5b6f1 Mon Sep 17 00:00:00 2001 From: winst Date: Thu, 2 Mar 2023 18:23:39 -0500 Subject: [PATCH 04/16] Update grammar --- 1-js/02-first-steps/04-variables/article.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-js/02-first-steps/04-variables/article.md b/1-js/02-first-steps/04-variables/article.md index ec6c3a1c6..0c1e29567 100644 --- a/1-js/02-first-steps/04-variables/article.md +++ b/1-js/02-first-steps/04-variables/article.md @@ -172,7 +172,7 @@ let userName; let test123; ``` -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`. +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`. 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. From 87bfe5b6bc7a96415974736c21b87384da0fb829 Mon Sep 17 00:00:00 2001 From: swapnasahoo Date: Tue, 17 Feb 2026 15:32:59 +0530 Subject: [PATCH 05/16] docs: replace figure brackets with curly braces across all occurrences --- .../02-coding-style/1-style-errors/solution.md | 4 ++-- 1-js/04-object-basics/01-object/article.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md index 4facc8b29..93c1947ca 100644 --- a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md +++ b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md @@ -3,7 +3,7 @@ You could note the following: ```js no-beautify function pow(x,n) // <- no space between arguments -{ // <- figure bracket on a separate line +{ // <- curly braces on a separate line let result=1; // <- no spaces before or after = for(let i=0;i, there are eight data types in JavaScri 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. -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. +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. 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. @@ -20,7 +20,7 @@ let user = {}; // "object literal" syntax ![](object-user-empty.svg) -Usually, the figure brackets `{...}` are used. That declaration is called an *object literal*. +Usually, the curly braces `{...}` are used. That declaration is called an *object literal*. ## Literals and properties From 953c2dbf45e5dfa40a9b78d39ffbf9bd7320d380 Mon Sep 17 00:00:00 2001 From: "Stanislav (Stanley) Modrak" <44023416+smith558@users.noreply.github.com> Date: Thu, 26 Feb 2026 10:25:28 +0000 Subject: [PATCH 06/16] Improve coding style --- .../02-coding-style/1-style-errors/solution.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md index 93c1947ca..31b3bb7ae 100644 --- a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md +++ b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md @@ -3,7 +3,7 @@ You could note the following: ```js no-beautify function pow(x,n) // <- no space between arguments -{ // <- curly braces on a separate line +{ // <- curly brace on a separate line let result=1; // <- no spaces before or after = for(let i=0;i Date: Fri, 6 Mar 2026 15:01:45 -0300 Subject: [PATCH 07/16] Update 1-js/02-first-steps/04-variables/article.md --- 1-js/02-first-steps/04-variables/article.md | 1 - 1 file changed, 1 deletion(-) diff --git a/1-js/02-first-steps/04-variables/article.md b/1-js/02-first-steps/04-variables/article.md index 040759a28..2396981e7 100644 --- a/1-js/02-first-steps/04-variables/article.md +++ b/1-js/02-first-steps/04-variables/article.md @@ -175,7 +175,6 @@ let userName; let test123; ``` -<<<<<<< HEAD Quando o nome contém várias palavras, o [camelCase](https://en.wikipedia.org/wiki/CamelCase) é normalmente utilizado. Isto é: as palavras vão uma após a outra, e cada palavra exceto a primeira começa com uma letra maiúscula: `myVeryLongName`. ======= 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`. From fa622b015b3d61ec7fb86cfcb677cea7af357e8e Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:02:00 -0300 Subject: [PATCH 08/16] Update 1-js/02-first-steps/04-variables/article.md --- 1-js/02-first-steps/04-variables/article.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/1-js/02-first-steps/04-variables/article.md b/1-js/02-first-steps/04-variables/article.md index 2396981e7..108e96692 100644 --- a/1-js/02-first-steps/04-variables/article.md +++ b/1-js/02-first-steps/04-variables/article.md @@ -176,9 +176,6 @@ let test123; ``` Quando o nome contém várias palavras, o [camelCase](https://en.wikipedia.org/wiki/CamelCase) é normalmente utilizado. Isto é: as palavras vão uma após a outra, e cada palavra exceto a primeira começa com uma letra maiúscula: `myVeryLongName`. -======= -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`. ->>>>>>> ff804bc19351b72bc5df7766f4b9eb8249a3cb11 O que é interessante -- o sinal de dólar `'$'` e o sublinhado `'_'` também podem ser usados em nomes. Eles são símbolos regulares, assim como letras, sem nenhum significado especial. From fd022ec26ae882cd71d1cc9855480bbf5b1c2379 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:02:10 -0300 Subject: [PATCH 09/16] Update 1-js/02-first-steps/08-operators/article.md --- 1-js/02-first-steps/08-operators/article.md | 1 - 1 file changed, 1 deletion(-) diff --git a/1-js/02-first-steps/08-operators/article.md b/1-js/02-first-steps/08-operators/article.md index eeb21f54e..3dd206f44 100644 --- a/1-js/02-first-steps/08-operators/article.md +++ b/1-js/02-first-steps/08-operators/article.md @@ -266,7 +266,6 @@ alert( c ); // 4 Atribuições encadeadas são avaliadas da direita para a esquerda. Primeiro, a expressão mais à direita `2 + 2` é avaliada e então atribuída às variáveis na esquerda: `c`, `b` e `a`. No fim, todas as variáveis compartilham um mesmo valor. -<<<<<<< HEAD Uma vez mais, para o propósito de legibilidade é melhor dividir tal código em algumas linhas: ======= Once again, for the purposes of readability it's better to split such code into a few lines: From a3d8cce8ce42a4fdaa0c1505ab805c85c182b46f Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:02:19 -0300 Subject: [PATCH 10/16] Update 1-js/02-first-steps/08-operators/article.md --- 1-js/02-first-steps/08-operators/article.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/1-js/02-first-steps/08-operators/article.md b/1-js/02-first-steps/08-operators/article.md index 3dd206f44..57d37a247 100644 --- a/1-js/02-first-steps/08-operators/article.md +++ b/1-js/02-first-steps/08-operators/article.md @@ -267,9 +267,6 @@ alert( c ); // 4 Atribuições encadeadas são avaliadas da direita para a esquerda. Primeiro, a expressão mais à direita `2 + 2` é avaliada e então atribuída às variáveis na esquerda: `c`, `b` e `a`. No fim, todas as variáveis compartilham um mesmo valor. Uma vez mais, para o propósito de legibilidade é melhor dividir tal código em algumas linhas: -======= -Once again, for the purposes of readability it's better to split such code into a few lines: ->>>>>>> ff804bc19351b72bc5df7766f4b9eb8249a3cb11 ```js c = 2 + 2; From 0e6d1556e1b69fe66c7d645ec8ea7d25cc4188d4 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:02:27 -0300 Subject: [PATCH 11/16] Update 1-js/03-code-quality/02-coding-style/1-style-errors/solution.md --- 1-js/03-code-quality/02-coding-style/1-style-errors/solution.md | 1 - 1 file changed, 1 deletion(-) diff --git a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md index ee49919c0..294a6cabc 100644 --- a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md +++ b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md @@ -2,7 +2,6 @@ Poderia notar o seguinte: ```js no-beautify -<<<<<<< HEAD function pow(x,n) // <- nenhum espaço entre argumentos { // <- chaveta de abertura numa linha em separado let result=1; // <- nenhum espaço antes ou depois de = From cc2d3f724df61de658a0523760729e7fbc8f9ea8 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:02:41 -0300 Subject: [PATCH 12/16] Update 1-js/03-code-quality/02-coding-style/1-style-errors/solution.md --- .../02-coding-style/1-style-errors/solution.md | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md index 294a6cabc..f9b6ef964 100644 --- a/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md +++ b/1-js/03-code-quality/02-coding-style/1-style-errors/solution.md @@ -16,22 +16,6 @@ if (n<0) // <- nenhum espaço dentro (n < 0), e deveria existir uma linha extra { // <- chaveta de abertura numa linha em separado // abaixo - linhas longas podem ser repartidas por múltiplas linhas para melhorar a legíbilidade alert(`A potência de ${n} não é suportada, por favor insira um número inteiro maior do que zero`); -======= -function pow(x,n) // <- no space between arguments -{ // <- curly brace on a separate line - let result=1; // <- no spaces before or after = - for(let i=0;i>>>>>> ff804bc19351b72bc5df7766f4b9eb8249a3cb11 } else // <- poderia ser escrito numa única linha, como "} else {" { From c1a7837c19c93026475f384a8bd10e84de309049 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:02:49 -0300 Subject: [PATCH 13/16] Update 1-js/04-object-basics/01-object/article.md --- 1-js/04-object-basics/01-object/article.md | 1 - 1 file changed, 1 deletion(-) diff --git a/1-js/04-object-basics/01-object/article.md b/1-js/04-object-basics/01-object/article.md index 999635918..81a8881d9 100644 --- a/1-js/04-object-basics/01-object/article.md +++ b/1-js/04-object-basics/01-object/article.md @@ -5,7 +5,6 @@ Como sabemos, pelo capítulo , existem oito tipos de dados em JavaSc Em contraste, objetos são usados para armazenar, por meio de uma chave, coleções de vários dados e entidades mais complexas. Em JavaScript, os objetos penetram em quase todos os aspetos da linguagem. Portanto, devemos primeiro os compreender antes de nos envolver com detalhe em algo mais. -<<<<<<< HEAD Um objeto pode ser criado por chavetas `{…}`, com uma lista opcional de *propriedades*. Uma propriedade é um par "key: value" (chave: valor), onde `key` é uma *string* (também chamada de "nome da propriedade"), e `value` pode ser qualquer coisa. ======= 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. From 134ed82e82cba21c9d8f3cc599b617fa4f023746 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:02:59 -0300 Subject: [PATCH 14/16] Update 1-js/04-object-basics/01-object/article.md --- 1-js/04-object-basics/01-object/article.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/1-js/04-object-basics/01-object/article.md b/1-js/04-object-basics/01-object/article.md index 81a8881d9..861a402ce 100644 --- a/1-js/04-object-basics/01-object/article.md +++ b/1-js/04-object-basics/01-object/article.md @@ -6,9 +6,6 @@ Como sabemos, pelo capítulo , existem oito tipos de dados em JavaSc Em contraste, objetos são usados para armazenar, por meio de uma chave, coleções de vários dados e entidades mais complexas. Em JavaScript, os objetos penetram em quase todos os aspetos da linguagem. Portanto, devemos primeiro os compreender antes de nos envolver com detalhe em algo mais. Um objeto pode ser criado por chavetas `{…}`, com uma lista opcional de *propriedades*. Uma propriedade é um par "key: value" (chave: valor), onde `key` é uma *string* (também chamada de "nome da propriedade"), e `value` pode ser qualquer coisa. -======= -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. ->>>>>>> ff804bc19351b72bc5df7766f4b9eb8249a3cb11 Podemos imaginar um objeto como um fichário com ficheiros assinados. Cada peça de informação, é armazenada no seu ficheiro por meio de uma chave. É fácil encontrar um ficheiro através do seu nome, ou adicionar/remover um ficheiro. From d7dddb36837920c30830697c6436db160e1d2a06 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:03:07 -0300 Subject: [PATCH 15/16] Update 1-js/04-object-basics/01-object/article.md --- 1-js/04-object-basics/01-object/article.md | 1 - 1 file changed, 1 deletion(-) diff --git a/1-js/04-object-basics/01-object/article.md b/1-js/04-object-basics/01-object/article.md index 861a402ce..82fe6e650 100644 --- a/1-js/04-object-basics/01-object/article.md +++ b/1-js/04-object-basics/01-object/article.md @@ -20,7 +20,6 @@ let user = {}; // sintaxe de "objeto literal" ![](object-user-empty.svg) -<<<<<<< HEAD Geralmente, são utilizadas as chavetas `{...}`. Essa declaração é chamada de *objeto literal*. ======= Usually, the curly braces `{...}` are used. That declaration is called an *object literal*. From 2a23e93335d0ccd5352b60eb5fe5771075a712fe Mon Sep 17 00:00:00 2001 From: Gabriel Fernandes Date: Fri, 6 Mar 2026 15:03:14 -0300 Subject: [PATCH 16/16] Update 1-js/04-object-basics/01-object/article.md --- 1-js/04-object-basics/01-object/article.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/1-js/04-object-basics/01-object/article.md b/1-js/04-object-basics/01-object/article.md index 82fe6e650..7cb931672 100644 --- a/1-js/04-object-basics/01-object/article.md +++ b/1-js/04-object-basics/01-object/article.md @@ -21,9 +21,6 @@ let user = {}; // sintaxe de "objeto literal" ![](object-user-empty.svg) Geralmente, são utilizadas as chavetas `{...}`. Essa declaração é chamada de *objeto literal*. -======= -Usually, the curly braces `{...}` are used. That declaration is called an *object literal*. ->>>>>>> ff804bc19351b72bc5df7766f4b9eb8249a3cb11 ## Literais e propriedades