-
Notifications
You must be signed in to change notification settings - Fork 28
Sync with upstream @ 5b195795 #38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
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...
Fix small typo in comment
Add a missing word
Update article.md
consistent error output comments
Added clarification
Adding 'object' after 'Property descriptor' -- even though it is said not far above that the 'property descriptor' returned by `Object.getOwnPropertyDescriptor` is an object, I think it wouldn't hurt to discretely include that info here (though of course it's also implied by the usage in the examples). Especially if someone is quickly scanning the article looking for `Object.defineProperty` and didn't just read the part above.
Update solution.md
Update article.md
Update article.md
|
|
This PR was automatically generated to merge changes from en.javascript.info at 5b19579
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.