reenabled @typescript-eslint/no-unnecessary-condition

This commit is contained in:
Eugene Pankov
2021-01-02 20:10:00 +01:00
parent 946f4292ef
commit 4d9cc91e91
36 changed files with 197 additions and 164 deletions

View File

@@ -5,7 +5,7 @@ import { Window, WindowOptions } from './window'
import { pluginManager } from './pluginManager'
export class Application {
private tray: Tray
private tray?: Tray
private windows: Window[] = []
constructor () {
@@ -131,10 +131,8 @@ export class Application {
}
disableTray (): void {
if (this.tray) {
this.tray.destroy()
this.tray = null
}
this.tray?.destroy()
this.tray = null
}
hasWindows (): boolean {

View File

@@ -8,17 +8,15 @@ try {
appPath = path.dirname(require('electron').remote.app.getPath('exe'))
}
if (null != appPath) {
if (fs.existsSync(path.join(appPath, 'terminus-data'))) {
fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data'))
}
const portableData = path.join(appPath, 'data')
if (fs.existsSync(portableData)) {
console.log('reset user data to ' + portableData)
try {
require('electron').app.setPath('userData', portableData)
} catch {
require('electron').remote.app.setPath('userData', portableData)
}
if (fs.existsSync(path.join(appPath, 'terminus-data'))) {
fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data'))
}
const portableData = path.join(appPath, 'data')
if (fs.existsSync(portableData)) {
console.log('reset user data to ' + portableData)
try {
require('electron').app.setPath('userData', portableData)
} catch {
require('electron').remote.app.setPath('userData', portableData)
}
}

View File

@@ -35,9 +35,9 @@ export class Window {
ready: Promise<void>
private visible = new Subject<boolean>()
private closed = new Subject<void>()
private window: GlasstronWindow
private window?: GlasstronWindow
private windowConfig: ElectronConfig
private windowBounds: Rectangle
private windowBounds?: Rectangle
private closing = false
private lastVibrancy: {enabled: boolean, type?: string} | null = null
private disableVibrancyWhileDragging = false