Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Sync with upstream @ a4a84083 #9

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

Closed
javascript-translate-bot wants to merge 148 commits into master from sync-a4a84083
Closed

Conversation

@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Jan 13, 2020

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

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

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

Saiyn Dembirel and others added 30 commits November 7, 2019 17:19
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>
fixed a word 'operational' to be 'operating'
replace russian-english comment with english
'and want' to implement...
KennethKinLum and others added 26 commits December 26, 2019 10:33
...onentsjs
Renew link for polyfill about webcomponentsjs
Make minor grammar corrections/updates to async/promise-error-handling
Make minor grammar corrections/updates to async/promise-api
Make minor grammar corrections/updates to async/promisify
Fixed small typo in 'Page: DOMContentLoaded, load, beforeunload, unload' article.md
Make minor grammar corrections/updates to async/promise-chaining
Make minor grammar corrections/updates to async/async-await
Copy link

claassistantio commented Jan 13, 2020
edited
Loading

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.
3 out of 12 committers have signed the CLA.

✅ leviding
✅ KennethKinLum
✅ iliakan
❌ lex111
❌ nylki
❌ sajadhsm
❌ ogaclejapan
❌ jianlin
❌ paroche
❌ karniol
❌ dashaezhova
❌ jchue
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

AltStyle によって変換されたページ (->オリジナル) /