-
Notifications
You must be signed in to change notification settings - Fork 503
4.45.0 master <= develop #2923
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
Merged
4.45.0 master <= develop #2923
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
fb48c06
블럭 도움말 위키 링크 추가하기.
3728da0
aidt objectEditable 옵션사용시 stage handle조작 안되도록 수정
385ba16
Merge pull request #2910 from entrylabs/issue/9097
leunge ef5c2cc
Merge pull request #2911 from entrylabs/issue/9093
leunge 9bea8a3
드론 블록 기능 추가
wing1008 d646a04
Update Cocodron Controller: Added English descriptions
wing1008 6eda079
Removed h origin develop-hw
wing1008 8cec4e0
오류 수정
fd2aace
오류 수정
a42c836
text font 변경.
52154ad
리뷰반영
62085f2
엔트리 연결시 / 엔트리 정지시 알라 얼굴 표시되도록 수정
irarykim 1a6eeef
게임/캐릭터 아이콘 블록 추가
irarykim aba5cac
엔트리 연결시 / 엔트리 정지시 알라 얼굴 표시되도록 수정
irarykim 489bb0f
게임/캐릭터 아이콘 블록 추가
irarykim 9a10606
Merge pull request #2915 from entrylabs/issue/9109
leunge 40113cd
Remove package-lock.json and yarn.lock
wing1008 caa1d4e
Update @mediapipe/tasks-vision to 0.10.18
wing1008 33be4dd
Merge pull request #2917 from irarykim/develop-hw-robotai-lite
Tnks2U a8dd8f5
Merge pull request #2916 from irarykim/develop-hw-koalabot-lite
Tnks2U 3edb0c5
Merge pull request #2914 from wing1008/develop-hw
Tnks2U cb59582
editable = false 일 경우 Input disabled가 되어 클릭이 안되는 오류 수정
67b2051
lint : cocodrone 린트적용
Tnks2U 882414f
feat : 코코드론의 WS최초 실행시 로그 제거
Tnks2U 2a08d0e
Merge pull request #2919 from entrylabs/issue/9093_2
leunge 68dca28
continueLoop 로직 수정
01fbeb9
무한루프 오류 수정
265107e
Merge pull request #2920 from entrylabs/develop-hw
Tnks2U File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -72,6 +72,18 @@ class EntryBlockHelper { | |||||
| this._elementsContainer.addClass('entryBlockHelperContent textModeElem selectAble'); | ||||||
| blockHelperContent.appendChild(this._elementsContainer); | ||||||
|
|
||||||
| const blockHelperLink = Entry.createElement( | ||||||
| 'div', | ||||||
| 'entryBlockHelperLinkWorkspace' | ||||||
| ); | ||||||
| blockHelperLink.addClass('blockHelperLink'); | ||||||
| const helperLink = Entry.createElement('a', 'entryBlockHelperLink'); | ||||||
| helperLink.addClass('linkTextElem'); | ||||||
| helperLink.setAttribute('target' ,'_blank'); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Suggested change
|
||||||
| blockHelperLink.appendChild(helperLink); | ||||||
| blockHelperContent.appendChild(blockHelperLink); | ||||||
| this.blockHelperLink_ = helperLink; | ||||||
|
|
||||||
| if (typeof CodeMirror !== 'undefined') { | ||||||
| const codeMirrorTitle = Entry.createElement('div'); | ||||||
| codeMirrorTitle.addClass('entryBlockHelperTitle textModeElem'); | ||||||
|
|
@@ -189,6 +201,14 @@ class EntryBlockHelper { | |||||
| } else { | ||||||
| this._contentView.removeClass('textMode'); | ||||||
| this.blockHelperDescription_.textContent = description; | ||||||
| const category = Entry.block[type].wikiClass || Entry.Utils.getBlockCategory(type); | ||||||
| if (category) { | ||||||
| this.blockHelperLink_.textContent = Lang.Helper.link_to_entry_wiki; | ||||||
| this.blockHelperLink_.href = Lang.Helper[`wiki_link_${category}`]; | ||||||
| } else { | ||||||
| this.blockHelperLink_.textContent = ''; | ||||||
| this.blockHelperLink_.href = ''; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| code.createThread([def]); | ||||||
|
|
||||||
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace
⏎············'div',⏎············'entryBlockHelperLinkWorkspace'⏎········with'div',·'entryBlockHelperLinkWorkspace'