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 @ ff152b12 #31

Open
wants to merge 539 commits into
base: master
from
Open

Conversation

@javascript-translate-bot
Copy link

javascript-translate-bot commented Sep 14, 2020

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

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.

xehpuk and others added 30 commits Jun 15, 2020
`openRequest.result.version` in `onupgradeneeded` is not the current DB version. It is the requested version, equal to `event.newVersion`. `event.oldVersion` contains the current version.
Fixed onupgradeneeded handling
Testcases/function object 5
Calling throttle before setting the fake timers will break any implementations that save a timestamp outside the wrapper function.
Set fake timers before calling throttle
Add bottom and right properties for getCoords()
Fix typo
followed -> followed by
Fix typo
Correct misspelling retarteted -> retargeted
Was tempted to suggest something a bit wordier: "where it finds it and, in this case, changes it", but I thought this would do.
Fixing a typo
Fix typo
without -> with
minor type fixes
minor typo fix
There are some missing "=" sign according to the question.
Typos
2 small fixes
Fix minor typo error: delete blank
apcurran and others added 27 commits Sep 9, 2020
Thank you!
Restructure the Solution for 'Army of Functions' task and Fix Typos
Fix javascript-tutorial#2090 - Spelling Mistake
Close javascript-tutorial#2079 - Remove 'elem' from `elem.scrollLeft/scrollTop`
Some Corrections
Fix javascript-tutorial#2098 - replace let with var in IIFE example
Improve 'long polling' article. Complements #2073.
Corrected spelling of "representation"
Update article.md
Sync safe Number borders across chapter 1.2.5
Update article.md
Fix typo in 1.2.6
Update article.md
@javascript-translate-bot javascript-translate-bot requested a review from javascript-tutorial/translate-pa Sep 14, 2020
@CLAassistant
Copy link

CLAassistant commented Sep 14, 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.
3 out of 7 committers have signed the CLA.

LitStronger
iliakan
vsemozhetbyt
cristian-wang
Jarvis-3000
apcurran
MuhammedZakir
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
Linked issues

Successfully merging this pull request may close these issues.

None yet

You can’t perform that action at this time.