From 437cd737ccef8c71963fe7086bda04ab253366fc Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Mon, 14 Dec 2015 14:02:19 +0100 Subject: [PATCH 1/2] Fixes popped out terminal title --- client/app/scripts/components/terminal-app.js | 1 + client/app/scripts/components/terminal.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/app/scripts/components/terminal-app.js b/client/app/scripts/components/terminal-app.js index fc31b3442..dec4e86f6 100644 --- a/client/app/scripts/components/terminal-app.js +++ b/client/app/scripts/components/terminal-app.js @@ -21,6 +21,7 @@ export class TerminalApp extends React.Component { receiveControlPipeFromParams(params.pipe.id, null, params.pipe.raw, false); this.state = { + title: params.title, titleBarColor: params.titleBarColor, statusBarColor: params.statusBarColor, controlPipe: AppStore.getControlPipe() diff --git a/client/app/scripts/components/terminal.js b/client/app/scripts/components/terminal.js index d6cc7847c..088c2583f 100644 --- a/client/app/scripts/components/terminal.js +++ b/client/app/scripts/components/terminal.js @@ -132,6 +132,7 @@ export default class Terminal extends React.Component { const innerNode = ReactDOM.findDOMNode(component.inner); this.term.open(innerNode); this.term.on('data', (data) => { + log('data', data); if (this.socket) { this.socket.send(data); } @@ -174,7 +175,6 @@ export default class Terminal extends React.Component { } componentDidUpdate(prevProps, prevState) { - log('cdu terminal'); const sizeChanged = ( prevState.cols !== this.state.cols || prevState.rows !== this.state.rows @@ -182,7 +182,7 @@ export default class Terminal extends React.Component { if (sizeChanged) { this.term.resize(this.state.cols, this.state.rows); } - if (this.isEmbedded()) { + if (!this.isEmbedded()) { setDocumentTitle(this.getTitle()); } } From 08a68aa605f21d77c949c91c1d7d18797bfb75af Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Mon, 14 Dec 2015 15:23:21 +0100 Subject: [PATCH 2/2] Oops, forgot to remove a log. --- client/app/scripts/components/terminal.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/app/scripts/components/terminal.js b/client/app/scripts/components/terminal.js index 088c2583f..525b9c7a9 100644 --- a/client/app/scripts/components/terminal.js +++ b/client/app/scripts/components/terminal.js @@ -132,7 +132,6 @@ export default class Terminal extends React.Component { const innerNode = ReactDOM.findDOMNode(component.inner); this.term.open(innerNode); this.term.on('data', (data) => { - log('data', data); if (this.socket) { this.socket.send(data); }