chore: C01 conflict 해결#1848
Open
dohy-eon wants to merge 11 commits into
Open
Conversation
|
|
누락된 번역 내용 추가했습니다.
모듈 스코프 관련 누락된 번역 글 추가했습니다.
Author
|
@electrohyun 리뷰 부탁드립니다! |
electrohyun
reviewed
May 14, 2026
electrohyun
left a comment
electrohyun
left a comment
There was a problem hiding this comment.
@dohy-eon 안녕하세요. 리뷰 진행하였습니다😃
작업해 주신 내용 중 이미 번역된 사항에 top-level scope '독립적인 스코프'를 그대로 옮겨 top-level variables를 '독립적인 변수'로 번역해 주신 게 아니라 '최상위 변수'로 번역해 주신 점이 적절했다고 생각합니다. 이후 일관되게 용어 사용해 주신 점도 좋았습니다!
이외의 충돌 마커 / 중복되거나 누락된 내용은 확인되지 않으며, 코드 블록과 마크다운 문법도 정상적으로 보입니다.
아래 코멘트 확인해주시면 Approve 진행하도록 하겠습니다! 고생하셨습니다.
번역 문구 개선 Co-authored-by: Gihyeon Jeong / 정기현 <[email protected]>
electrohyun
approved these changes
May 14, 2026
Author
세심하게 봐주셔서 감사드리고, 용어 부분도 좋게 봐주셔서 감사합니다! 남겨주신 코멘트 확인 후 반영 작업 모두 완료했습니다. |
Author
|
@Violet-Bora-Lee 말씀 주신 upstream/master 변경사항 기준으로 전체 다시 확인했고 누락된 내용들 반영 완료했습니다! 보이는 부분들은 전반적으로 재검토 후 수정해서 재리뷰 요청드렸습니다. 확인 부탁드립니다 🙇 |
Comment on lines
-109
to
-119
| There are ways to interact with the camera/microphone and other devices, but they require a user's explicit permission. So a JavaScript-enabled page may not sneakily enable a web-camera, observe the surroundings and send the information to the [NSA](https://en.wikipedia.org/wiki/National_Security_Agency). | ||
| - Different tabs/windows generally do not know about each other. Sometimes they do, for example when one window uses JavaScript to open the other one. But even in this case, JavaScript from one page may not access the other page if they come from different sites (from a different domain, protocol or port). | ||
|
|
||
| This is called the "Same Origin Policy". To work around that, *both pages* must agree for data exchange and must contain special JavaScript code that handles it. We'll cover that in the tutorial. | ||
|
|
||
| This limitation is, again, for the user's safety. A page from `http://anysite.com` which a user has opened must not be able to access another browser tab with the URL `http://gmail.com`, for example, and steal information from there. | ||
| - JavaScript can easily communicate over the net to the server where the current page came from. But its ability to receive data from other sites/domains is severely limited. Though possible, it requires explicit agreement (expressed in HTTP headers) from the remote side. Once again, that's a safety limitation. | ||
|
|
||
|  | ||
|
|
||
| Such limitations do not exist if JavaScript is used outside of the browser, for example on a server. Modern browsers also allow plugins/extensions which may ask for extended permissions. |
|
|
||
| You can find it at <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference>. | ||
|
|
||
| Although, it's often best to use an internet search instead. Just use "MDN [term]" in the query, e.g. <https://google.com/search?q=MDN+parseInt> to search for the `parseInt` function. |
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
6 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.
요약
upstream 동기화 과정에서 발생한 머지 충돌 마커를 정리했습니다.
대상 디렉터리:
1-js/01-getting-started,1-js/13-modules<<<<<<<,=======,>>>>>>>)을 모두 제거했습니다.변경 파일 (6개)
1-js/01-getting-started/1-intro/article.md— 충돌 10개 정리2-manuals-specifications/article.md— 충돌 5개 정리3-code-editors/article.md— 충돌 3개 정리4-devtools/article.md— 충돌 1개 정리1-js/13-modules/01-modules-intro/article.md— 충돌 14개 정리02-import-export/article.md— 충돌 11개 정리총 44개 충돌 블록 / 331줄 정리 완료.
연관 이슈
Pull Request 체크리스트
TODO
chore: C01 conflict 해결