recovery fixes

This commit is contained in:
Eugene Pankov 2020-02-05 14:15:51 +03:00
parent ceb75323fe
commit e99b83dfdc
4 changed files with 4 additions and 23 deletions

View File

@ -25,7 +25,9 @@ export class TabRecoveryService {
let token = tab.getRecoveryToken() let token = tab.getRecoveryToken()
if (token) { if (token) {
token = token.then(r => { token = token.then(r => {
if (r) {
r.tabColor = tab.color r.tabColor = tab.color
}
return r return r
}) })
} }

View File

@ -99,10 +99,6 @@ export class SettingsTabComponent extends BaseTabComponent {
this.isShellIntegrationInstalled = await this.shellIntegration.isInstalled() this.isShellIntegrationInstalled = await this.shellIntegration.isInstalled()
} }
async getRecoveryToken (): Promise<any> {
return null
}
ngOnDestroy () { ngOnDestroy () {
this.configSubscription.unsubscribe() this.configSubscription.unsubscribe()
this.config.save() this.config.save()

View File

@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'
import { FormsModule } from '@angular/forms' import { FormsModule } from '@angular/forms'
import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
import TerminusCorePlugin, { ToolbarButtonProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider } from 'terminus-core' import TerminusCorePlugin, { ToolbarButtonProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component' import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component'
import { MultiHotkeyInputComponent } from './components/multiHotkeyInput.component' import { MultiHotkeyInputComponent } from './components/multiHotkeyInput.component'
@ -11,7 +11,6 @@ import { SettingsTabComponent } from './components/settingsTab.component'
import { SettingsTabBodyComponent } from './components/settingsTabBody.component' import { SettingsTabBodyComponent } from './components/settingsTabBody.component'
import { ButtonProvider } from './buttonProvider' import { ButtonProvider } from './buttonProvider'
import { RecoveryProvider } from './recoveryProvider'
import { SettingsHotkeyProvider } from './hotkeys' import { SettingsHotkeyProvider } from './hotkeys'
import { SettingsConfigProvider } from './config' import { SettingsConfigProvider } from './config'
@ -25,7 +24,6 @@ import { SettingsConfigProvider } from './config'
], ],
providers: [ providers: [
{ provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true }, { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },
{ provide: TabRecoveryProvider, useClass: RecoveryProvider, multi: true },
{ provide: ConfigProvider, useClass: SettingsConfigProvider, multi: true }, { provide: ConfigProvider, useClass: SettingsConfigProvider, multi: true },
{ provide: HotkeyProvider, useClass: SettingsHotkeyProvider, multi: true }, { provide: HotkeyProvider, useClass: SettingsHotkeyProvider, multi: true },
], ],

View File

@ -1,15 +0,0 @@
import { Injectable } from '@angular/core'
import { TabRecoveryProvider, RecoveredTab } from 'terminus-core'
import { SettingsTabComponent } from './components/settingsTab.component'
/** @hidden */
@Injectable()
export class RecoveryProvider extends TabRecoveryProvider {
async recover (recoveryToken: any): Promise<RecoveredTab|null> {
if (recoveryToken && recoveryToken.type === 'app:settings') {
return { type: SettingsTabComponent }
}
return null
}
}