Skip to content

Sync with upstream @ dccca58f#5

Closed
javascript-translate-bot wants to merge 135 commits intomasterfrom
sync-dccca58f
Closed

Sync with upstream @ dccca58f#5
javascript-translate-bot wants to merge 135 commits intomasterfrom
sync-dccca58f

Conversation

@javascript-translate-bot

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

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.

haond10adp and others added 30 commits September 26, 2020 09:16
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.
The current link is redirected to the parent chapter.
This fix is in sync with
https://javascript.info/operators#bitwise-operators and #2117
Currently, syntax of the 1 and 3 cases is the same.
1.4.1.8_multiply numeric - Update 'properties' to 'property values'
As promised.
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.
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.
vsemozhetbyt and others added 26 commits October 27, 2020 18:30
It seems there are no polymorphic functions in this chapter.
Fix possibly outdated note in 1.9.6 (instanceof)
Minor clarification on WeakMap and WeakSet
Replace rules.indent array with number
Fix links in 1.8.4 (Prototype methods)
Delete excess semicolon in 1.9.1 (Class basic syntax)
Clarify task code place in 1.9.1 (Class basic syntax)
Add missing semicolons in 1.9.2 (Class inheritance)
@CLAassistant
Copy link

CLAassistant commented Nov 2, 2020

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 7 committers have signed the CLA.

✅ iliakan
✅ vsemozhetbyt
❌ Herrera-pgoat
❌ Dewke
❌ mikemitchell574
❌ plakxj
❌ Youngjin-KimY
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.