GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-08 13:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref: Eugeny/tabby/pull#8416

Browse Source
This commit is contained in:
Clem Fern 2023-06-15 21:07:24 +02:00
parent 2c0e50771f
commit cea5cc73ff
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tabby-terminal/src/api/baseTerminalTab.component.ts
View File

@ -772,10 +772,7 @@ export class BaseTerminalTabComponent<P extends BaseTerminalProfile> extends Bas
}) })
this.attachSessionHandler(this.session.closed$, () => { this.attachSessionHandler(this.session.closed$, () => {
const behavior = this.profile.behaviorOnSessionEnd this.onSessionClosed(destroyOnSessionClose)
if (destroyOnSessionClose || behavior === 'close' || behavior === 'auto' && this.isSessionExplicitlyTerminated()) {
this.destroy()
}
}) })
this.attachSessionHandler(this.session.destroyed$, () => { this.attachSessionHandler(this.session.destroyed$, () => {
@ -788,6 +785,26 @@ export class BaseTerminalTabComponent<P extends BaseTerminalProfile> extends Bas
}) })
} }
/**
* Method called when session is closed.
*/
protected onSessionClosed (destroyOnSessionClose = false): void {
if (destroyOnSessionClose || this.doesTabShouldBeDestroyedOnSessionClosed()) {
this.destroy()
}
}
/**
* Return true if tab should be destroyed on session closed.
*/
protected doesTabShouldBeDestroyedOnSessionClosed (): boolean {
const behavior = this.profile.behaviorOnSessionEnd
if (behavior === 'close' || behavior === 'auto' && this.isSessionExplicitlyTerminated()) {
return true
}
return false
}
/** /**
* Method called when session is destroyed. Set the session to null * Method called when session is destroyed. Set the session to null
*/ */

2
tabby-terminal/src/api/connectableTerminalTab.component.ts
View File

@ -55,7 +55,7 @@ export abstract class ConnectableTerminalTabComponent<P extends BaseTerminalProf
if (this.frontend) { if (this.frontend) {
if (this.profile.behaviorOnSessionEnd === 'reconnect') { if (this.profile.behaviorOnSessionEnd === 'reconnect') {
this.reconnect() this.reconnect()
} else if (this.profile.behaviorOnSessionEnd === 'keep' || this.profile.behaviorOnSessionEnd === 'auto' && !this.isSessionExplicitlyTerminated()) { } else if (this.profile.behaviorOnSessionEnd === 'keep' || !this.doesTabShouldBeDestroyedOnSessionClosed()) {
this.offerReconnection() this.offerReconnection()
} }
} }