Sync with upstream @ e92bb83e #6
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
"`123` millonth" -> "`123 millionths"
Update article.md
Remove comma, change spelling of "labeled". While both "labelled" and "labeled" are correct, "labeled" is the preferred American spelling (though the British spelling "labelled" is more logical, given the general rules of English spelling, such as they are, since the "e" sound before the "l" is short, not long). Still, probably better with American spelling.
Update article.md
fix typo intentially -> intentionally
Fix incorrect link address
Fix typo: "and" instead of "и"
fix: type error of 1-js/03-code-quality/05-testing-mocha/article.md
Update article.md
Spell correction
|
|
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 e92bb83
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.