Skip to content
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

Sync with upstream @ 7b761858 #1052

Closed
wants to merge 795 commits into from
Closed

Conversation

javascript-translate-bot

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

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:

Click to open a list of 128 files

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.

vsemozhetbyt and others added 30 commits December 6, 2020 14:13
Fix possible typos in 1.3.6 (Polyfills and transpilers)
Sync examples from 2 commits in 8.5 (Shadow DOM slots...)
Fix typo in 8.5 (Shadow DOM slots...)
Update article.md in section 2.8
2-ui / 2-events / 5-dispatch-events

In subchapter "Event constructor": first word use "Built-in" instead of "Build-in"
Fix typo in 9.1 (Patterns and flags)
* Fix typos.
* Update a support note.
* Add a reference for a yet unexplained pattern.
Replace unicode with Unicode all over the book
`\bHello\b` pattern was just analyzed in the previous paragraph,
so the current wording is a bit confusing.
Without the `g` flag, we cannot say that the price is skipped.
Without the `\b` assertion, we will have the part of the price in the result.
As the task uses multiline HTML
and the note at the end suggests using `s` flag,
the lazy quantifier would be safer.
Refs: https://bugs.chromium.org/p/v8/issues/detail?id=10765
Refs: https://bugs.chromium.org/p/v8/issues/detail?id=11021

Can be tested in the Goole Chrome Beta, Dev, and Canary branches now,
as well as in the Node.js v8-canary branch.
joaquinelio and others added 26 commits March 23, 2021 03:39
in 06-advanced-functions/06-function-object/5-sum-many-brackets/solution.md
…s/04-throttle/solution.md

Well there is still a chance for a race condition but a smaller one.
We would need an atomic "if or set" for isThrottled
avoid race condition in 06-advanced-functions/09-call-apply-decorator…
…c-await

improve readability of article in chapter 8, async
@CLAassistant
Copy link

CLAassistant commented Mar 29, 2021

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 6 committers have signed the CLA.

✅ iliakan
✅ joaquinelio
❌ hamirmahal
❌ seamissu
❌ shreenanda-8
❌ LLyaudet
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.