Sync with upstream @ e074a5f8 #178
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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()
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
minor type fixes
minor typo fix
There are some missing "=" sign according to the question.
Fix minor typo error: delete blank
The title makes me ask "is 'if' keyword operator or not?". I think 'if' is not operator because it does not return any value and it is called if-statement.
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
Fix link in 1.2.8
|
|
Contributor
Member
|
@odsantos why should I? |
odsantos
added a commit
that referenced
this pull request
Oct 2, 2020
Update "1-js/01-getting-started/" after #178.
odsantos
added a commit
that referenced
this pull request
Oct 4, 2020
Update part of "1-js/02-first-steps" after #178.
odsantos
added a commit
that referenced
this pull request
Oct 5, 2020
Update "1-js/02-first-steps" (04 - 10) after #178
odsantos
added a commit
that referenced
this pull request
Oct 18, 2020
Resolve conflicts + updates after #178
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at e074a5f
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 310 files
To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterThis PR will be closed and replaced with a new one in a few days.