Sync with upstream @ 1edb0a38#104
Merged
ipapoutsidis merged 65 commits intomasterfrom Aug 28, 2022
Merged
Conversation
Fixed the wrong sequence
to make `alerts` work
Noticed that the word implementing was spelt incorrectly within the section for pointercancel events, thus I decided to correct it for reading comprehension reasons.
Fixed typo
According to MDN, the precedence of unary plus, unary negation, exponentiation, multiplication, division, addition, and subtraction is 1 lower than it is in the document
Line 265 and 266: Use 'fruits' instead of the 'arr' variable.
This is almost the minimal number of changes that I would make. I would still recommend changing "play" in the first line to "work".
Looks like the right line for a comment is the line 306 instead of 308.
Depends on https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence#Table, precedence of `??` and `||` should be 3 instead of 4
Edit precedence of `??` and `||`
Fix typo in pointercancel section
Correcting precedence number
Fixed a typo
Fix typos in array methods article.md
fix: shash -> backslash
|
|
| @@ -44,7 +44,7 @@ The `promise` object returned by the `new Promise` constructor has these interna | |||
| >>>>>>> fcfef6a07842ed56144e04a80c3a24de049a952a | |||
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 1edb0a3
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):
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.