Skip to content

Sync with upstream @ 2d5be7b7 #42

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

Merged
merged 105 commits into from
Nov 1, 2020
Merged

Sync with upstream @ 2d5be7b7 #42

merged 105 commits into from
Nov 1, 2020

Conversation

javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Oct 26, 2020

This PR was automatically generated to merge changes from en.javascript.info at 2d5be7b

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):

  1. Add remote upstream that links to the English version (only needs to be done once)
    • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
  2. Commit all current work locally and git checkout master
  3. Pull the recent changes from the English version:
    • git pull upstream master
  4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
    • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
      • git checkout --ours <path>
    • See the diff, what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
    • Then you can examine the changes in upstream and add them manually
  5. When conflicts resolved, commit them and git push origin master

Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).

This PR will be closed and replaced with a new one in a few days.

Siteproxy
haond10adp and others added 30 commits September 26, 2020 09:16

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
The task asks to multiply numeric object 'properties', however the term 'object properties' include both the 'property keys' of the object as well as the 'property values' of the object. It is clear the intention of the task is to change property values. 
This change improves clarity of the task description.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
The current link is redirected to the parent chapter.
This fix is in sync with
https://javascript.info/operators#bitwise-operators and #2117

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Currently, syntax of the 1 and 3 cases is the same.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix syntax enumeration in 1.4.7

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
minor change

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1.4.1.8_multiply numeric - Update 'properties' to 'property values'

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
correct minor typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix wrong variables names.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix link in 1.2.18

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update README.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
improved doc

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
As promised.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1. Without a real sorting part, the data output is not the same as with real sort (as the array is not really sorted when the callback returns `undefined`).
2. Current example may somehow encourage a reader to write sorting callbacks with undetermined behavior.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
As of the last versions of V8 (i.e. Chrome and Node.js), the current info seems outdated.

See also https://v8.dev/blog/array-sort
The page of the current link has not this anchor anymore.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
iliakan and others added 22 commits October 20, 2020 11:40

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Currently, the error is alerted and the console is empty (at least in Chrome).

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Remove possibly outdated comment

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
FIX: change ; to ,

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
FIX: delete extra space

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
One addition and one fix

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo in 1.4.7 (optional chaining)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Mention function declaration in 1.6.5 (global object)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix a typo in 1.6.6 (function object, NFE)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix possible typo in 1.6.7 ("new Function" syntax)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typos, specify link in 1.6.8 (Scheduling)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet