Skip to content
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.

Sign up for GitHub

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

upgrade xterm to fix terminal dragging between areas #4680

Merged
merged 1 commit into from
May 15, 2019
Merged

upgrade xterm to fix terminal dragging between areas #4680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/terminal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@theia/filesystem": "^0.6.0",
"@theia/process": "^0.6.0",
"@theia/workspace": "^0.6.0",
"xterm": "3.9.2"
"xterm": "3.13.0"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcdumais-work Is it fine?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @akosyakov , let me run the "ECD Theia Intellectual Property Clearance, Approach" on this PR branch and get back to you. ETA ~30 mins.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done - looks good - you can merge from a license PoV.

There was one new extra "NOASSERTION" dependency (nugget 2.0.1), but it looks to be BSD-license after investigation:

image

},
"publishConfig": {
"access": "public"
Expand Down
5 changes: 5 additions & 0 deletions packages/terminal/src/browser/terminal-widget-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,18 +288,23 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
}
}
protected onFitRequest(msg: Message): void {
super.onFitRequest(msg);
MessageLoop.sendMessage(this, Widget.ResizeMessage.UnknownSize);
}
protected onActivateRequest(msg: Message): void {
super.onActivateRequest(msg);
this.term.focus();
}
protected onAfterShow(msg: Message): void {
super.onAfterShow(msg);
this.update();
}
protected onAfterAttach(msg: Message): void {
super.onAfterAttach(msg);
this.update();
}
protected onResize(msg: Widget.ResizeMessage): void {
super.onResize(msg);
this.needsResize = true;
this.update();
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10441,10 +10441,10 @@ xtend@~2.1.1:
dependencies:
object-keys "~0.4.0"

xterm@3.9.2:
version "3.9.2"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.9.2.tgz#e94bfbb84217b19bc1c16ed43d303b8245c9313d"
integrity sha512-fpQJQFTosY97EK4eB7UOrlFAwwqv1rSqlXgttEVD0S1v4MlevsUkRwrM/ew5X73jQXc+vdglRtccIhcXg5wtGg==
xterm@3.13.0:
version "3.13.0"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.13.0.tgz#d0e06c3cf4c1f079aa83f646948457db3b04220b"
integrity sha512-FZVmvkkbkky3zldJ2NNOZ9h8jirtbGTlF4sIKMDrejR4wPsVZ3o4F++DQVkdeZqjAwtNOMoR17PMSOTZ+h070g==

y18n@^3.2.1:
version "3.2.1"
Expand Down