Sync with upstream @ 10c7807f #13
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes to Summary description of `clientLeft/clientTop`. I **think** this is what was meant.
added a missing word
The solution explanation is not very obvious so added another example to make things clear
quick description: before: .catch(f) is the same as promise.then(null, f) after: .catch(f) is the same as .then(null, f)
Changed the reference to each item of the array since it was previously defined as the variable word.
When assigning the static method `staticMethod` to the `User` class, as a property directly, no parentheses should be used after `User`, since this leads to an error: `SyntaxError: Unexpected token '('`. For this reason, such parentheses have to be removed.
in the control control forms section, fixed mistake selectionEnd and selectionStart were both said to be start position
Removed duplicated `also`.
Fix: typos in <5-network/02-formdata/article.md>
Fix err in syntax
Update article.md
fixed a word 'operational' to be 'operating'
typo
Update article.md
replace russian-english comment with english
modified a sentence
'and want' to implement...
Update article.md
adding the `[^]` pattern
Update article.md
", we have an object that is not an array, " -> ", we have an object that is not an array, "
"yield is a two-way road" -> "yield is a two-way street" "Two way street" is by far the more common and accepted way to say this. If you look up "two-way road" you will typically be redirected to "two-way street".
"returns the result outside" -> "returns the result to the outside"
Several punctuation changes, yielding: "1. We use the browser [fetch](info:fetch) method to download from a remote URL. It allows us to supply authorization and other headers if needed -- here GitHub requires `User-Agent`. 2. The fetch result is parsed as JSON. That's again a `fetch`-specific method. 3. We should get the next page URL from the `Link` header of the response. It has a special format, so we use a regexp for that. The next page URL may look like `https://api.github.com/repositories/93253246/commits?page=2`. It's generated by GitHub itself. 4. Then we yield all commits received, and when they finish, the next `while(url)` iteration will trigger, making one more request."
"such as browsers" -> "like in browsers"
"`import` allows to import functionality.." -> "`import` allows the import of functionality..." "relative the current file" -> "relative to the current file,"
"That's the correct variant:" -> "This is the correct variant:"
"Let's see that on examples." -> "Let's look at them using examples:"
"allows to configure" -> "allows us to configure"
"be aware that HTML-page" -> "be aware that the HTML page"
"`async` attribute" -> "the `async` attribute"
This reverts commit e4fb777.
This reverts commit d6035ee.
"better convenience" -> "more convenience"
"That's not a function" -> "It's not a function"
"chapter" -> "article" (6 times or so) I believe that is consistent with the agreed-upon terminology.
"as `Proxy` trap" -> "as the `Proxy` trap"
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at 10c7807
Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.
Alternatively, you can close this PR and merge conflicting changes manually.
The following files have conflicts and may need updates of the translations:
To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterThis PR will be closed and replaced with a new one in a few days.