Sync with upstream @ a0bfa924 #27
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
and -> or, methods -> methods I also have a question on the subject of this sentence (should this be a separate discussion entry?): In the "Extending built-in classes" article, in the "No static inheritance in built-ins" subsection, one finds: "But built-in classes are an exception. They don’t inherit statics from each other. For example, both Array and Date inherit from Object, so their instances have methods from Object.prototype. But Array.[[Prototype]] does not reference Object, so there’s no Array.keys() and Date.keys() static methods." In the "Extending built-in classes" article, in the "No static inheritance in built-ins" subsection, one finds: "But built-in classes are an exception. They don’t inherit statics from each other. For example, both Array and Date inherit from <code>Object</code>, so their instances have methods from <code>Object.prototype</code>. But <code>Array.[[Prototype]]</code> does not reference <code>Object</code>, so there’s no <code>Array.keys()</code> and <code>Date.keys()</code> static methods." This is a subject of some curiosity for me. Through a little testing, I believe I have found that, in fact <code>Array.[[Prototype]]</code> DOES, however, reference <code>Function.prototype</code>, i.e. <code>Array.__proto__ === Function.prototype</code> (<code>true</code>). (As does <code>Date.[[Prototype]]</code>). Is there someplace where this is explained? (Preferably in a way an intelligent 11-year-old could understand?).
'That's funny' -> 'It's funny'
"Now when the call looks for `count` variable, it first searches its own Lexical Environment (empty), then the Lexical Environment of the outer `makeCounter()` call, where finds it." to "Now when the call looks for `count` variable, it first searches its own Lexical Environment (empty), then the Lexical Environment of the outer `makeCounter()` call, where it finds it."
Events is -> Events are
allows to -> allows us to
listen to -> listen for some punctuation, little words
Summary -- adding 'adding' and 'happening'.
Added 'Oxford comma" (comma before 'and' at the end of a list). Not all consider it necessary, but I think it improves readability.
Add a comma, minor wording adjustments
'allow to' -> 'allow us to' optional comma
rephrasing
if -> ifs Phrasing, punctuation.
Update article.md
Update article.md
Fix minor grammatical error
Update article.md
Update article.md
Update article.md
Update article.md
Update article.md
Update article.md
Update article.md
Update article.md
Fix minor typos in Server Sent Events lesson
Fixed typo on line 366
Made some changes to make it more correct.
minor
Long awaited second stab at revising this paragraph (which someone in the distant past took issue with).
us, them, commas
Update article.md
Update article.md
Grammar issues fix
Fix minor typo
|
|
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 a0bfa92
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.