github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1979 from weaveworks/1977-fix-notty-resizing

Browse Source 
Allow resizing on attached pipes too.
This commit is contained in:
David
2016-11-04 13:30:05 +01:00
committed by GitHub
parent d0d100bd62 4004b21fa2
commit 722d5cdd0d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/app/scripts/components/terminal.js
View File

@@ -185,7 +185,7 @@ class Terminal extends React.Component {
this.term = new Term({
cols: this.state.cols,
rows: this.state.rows,
convertEol: !this.props.raw,
convertEol: !this.props.pipe.get('raw'),
cursorBlink: true,
scrollback: 10000,
});
@@ -278,6 +278,8 @@ class Terminal extends React.Component {
if (resizeTtyControl) {
doResizeTty(this.getPipeId(), resizeTtyControl, cols, rows)
.then(() => this.setState({cols, rows}));
} else if (!this.props.pipe.get('raw')) {
this.setState({cols, rows});
}
}

4
client/app/scripts/utils/web-api-utils.js
View File

@@ -232,11 +232,13 @@ export function doControlRequest(nodeId, control, dispatch) {
if (res) {
if (res.pipe) {
dispatch(blurSearch());
const resizeTtyControl = res.resize_tty_control &&
{id: res.resize_tty_control, probeId: control.probeId, nodeId: control.nodeId};
dispatch(receiveControlPipe(
res.pipe,
nodeId,
res.raw_tty,
{id: res.resize_tty_control, probeId: control.probeId, nodeId: control.nodeId}));
resizeTtyControl));
}
if (res.removedNode) {
dispatch(receiveControlNodeRemoved(nodeId));