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

Delete underlying pipe when terminal window closes

Browse Source
This commit is contained in:
Roberto Bruggemann
2018-02-05 17:33:24 +00:00
parent 20c57134c1
commit 1f3874aa56
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ function terminalCellSize(wrapperNode) {
}
function openNewWindow(url, bcr, minWidth = 200) {
function openNewWindow(url, bcr, pipeId, minWidth = 200) {
const screenLeft = window.screenX || window.screenLeft;
const screenTop = window.screenY || window.screenTop;
const popoutWindowToolbarHeight = 51;
@@ -164,6 +164,7 @@ class Terminal extends React.Component {
if (this.props.connect) {
this.mountTerminal();
}
window.addEventListener('beforeunload', this.handleBeforeUnload);
}
mountTerminal() {
@@ -206,6 +207,7 @@ class Terminal extends React.Component {
clearTimeout(this.resizeTimeout);
window.removeEventListener('resize', this.handleResizeDebounced);
window.removeEventListener('beforeunload', this.handleBeforeUnload);
if (this.term) {
log('destroy terminal');
@@ -238,6 +240,10 @@ class Terminal extends React.Component {
}
}
handleBeforeUnload() {
deletePipe(this.getPipeId());
}
handleCloseClick(ev) {
ev.preventDefault();
this.props.dispatch(clickCloseTerminal(this.getPipeId()));
@@ -251,7 +257,7 @@ class Terminal extends React.Component {
const bcr = this.node.getBoundingClientRect();
const minWidth = (this.state.characterWidth * 80) + (8 * 2);
openNewWindow(`${basePath(window.location.pathname)}/terminal.html#!/state/${paramString}`, bcr, minWidth);
openNewWindow(`${basePath(window.location.pathname)}/terminal.html#!/state/${paramString}`, bcr, this.getPipeId(), minWidth);
}
handleResize() {