From e64126af37ac94c113e1d4f62966d178748b19d0 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sat, 15 Jul 2017 19:07:41 +0200 Subject: [PATCH] bumped Angular --- app/package.json | 18 ++--- app/src/entry.ts | 2 +- app/yarn.lock | 76 ++++++++++++------- terminus-core/package.json | 1 - .../src/components/appRoot.component.ts | 9 ++- .../src/components/baseTab.component.ts | 6 +- .../src/components/tabHeader.component.pug | 2 +- .../src/components/tabHeader.component.ts | 17 ++++- terminus-core/src/index.ts | 5 ++ .../src/components/settingsTab.component.ts | 2 +- .../src/components/terminalTab.component.ts | 4 +- 11 files changed, 91 insertions(+), 51 deletions(-) diff --git a/app/package.json b/app/package.json index fe991d5e..179e1e1a 100644 --- a/app/package.json +++ b/app/package.json @@ -12,14 +12,14 @@ "watch": "webpack --progress --color --watch" }, "dependencies": { - "@angular/animations": "4.0.1", - "@angular/common": "4.0.1", - "@angular/compiler": "4.0.1", - "@angular/core": "4.0.1", - "@angular/forms": "4.0.1", - "@angular/platform-browser": "4.0.1", - "@angular/platform-browser-dynamic": "4.0.1", - "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22", + "@angular/animations": "4.3.0", + "@angular/common": "4.3.0", + "@angular/compiler": "4.3.0", + "@angular/core": "4.3.0", + "@angular/forms": "4.3.0", + "@angular/platform-browser": "4.3.0", + "@angular/platform-browser-dynamic": "4.3.0", + "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.28", "devtron": "1.4.0", "electron-config": "0.2.1", "electron-debug": "^1.0.1", @@ -29,7 +29,7 @@ "mz": "^2.6.0", "path": "0.12.7", "rxjs": "5.3.0", - "zone.js": "0.8.4" + "zone.js": "0.8.12" }, "devDependencies": { "@types/mz": "0.0.31" diff --git a/app/src/entry.ts b/app/src/entry.ts index a564f756..a40a7193 100644 --- a/app/src/entry.ts +++ b/app/src/entry.ts @@ -12,7 +12,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic' import { getRootModule } from './app.module' import { findPlugins, loadPlugins } from './plugins' -if (process.platform == 'win32') { +if (process.platform === 'win32') { process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH } diff --git a/app/yarn.lock b/app/yarn.lock index 3da0d71c..b1c274f8 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2,37 +2,51 @@ # yarn lockfile v1 -"@angular/animations@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.0.1.tgz#154420c8ee5c22fbaf1434b6d156150cf5218da6" +"@angular/animations@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.3.0.tgz#56f34b84649379202ac359929b82eb0b915e9c72" + dependencies: + tslib "^1.7.1" -"@angular/common@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.0.1.tgz#df488eada842b2d841ded750712292b18387b5b0" +"@angular/common@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.3.0.tgz#13a54a6929dd52f9729b16ae446fad58fe163053" + dependencies: + tslib "^1.7.1" -"@angular/compiler@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.0.1.tgz#15721edb148167a2d83b6f9324817e658eac8280" +"@angular/compiler@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.3.0.tgz#55503bf27a1f062f71b9495393f3311903a8fc43" + dependencies: + tslib "^1.7.1" -"@angular/core@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.0.1.tgz#0b110a001012076ea696460ccd922707bcdf51ba" +"@angular/core@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.3.0.tgz#bd2249c3de1224a7c6536c4aba728d6565329334" + dependencies: + tslib "^1.7.1" -"@angular/forms@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.0.1.tgz#b9ebdbbb8ace0f9a3bf9e53c299eafdfab1d5041" +"@angular/forms@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.3.0.tgz#7d0c7a854737e9a30a5fd9665f8d4f56a1b91bd8" + dependencies: + tslib "^1.7.1" -"@angular/platform-browser-dynamic@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.0.1.tgz#fd5debb2d3f6474350965e71c2674e2170d7cfcb" +"@angular/platform-browser-dynamic@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.0.tgz#551fb18851b27ee8f3e4b0ee25aad10bd7b312e3" + dependencies: + tslib "^1.7.1" -"@angular/platform-browser@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.0.1.tgz#4b9efbeb2fbb900de188743b988802d3aa2b33ff" +"@angular/platform-browser@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.3.0.tgz#02389489185185c3becf06359346100e5479c7e1" + dependencies: + tslib "^1.7.1" -"@ng-bootstrap/ng-bootstrap@1.0.0-alpha.22": - version "1.0.0-alpha.22" - resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-alpha.22.tgz#aaad058cc39293ea6184e4b9b849f298c0b11a86" +"@ng-bootstrap/ng-bootstrap@^1.0.0-alpha.28": + version "1.0.0-alpha.28" + resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-alpha.28.tgz#30a6503bf7f94f9d3187591fb3267b59cc0cdaad" "@types/mz@0.0.31": version "0.0.31" @@ -41,8 +55,8 @@ "@types/node" "*" "@types/node@*": - version "8.0.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.7.tgz#fb0ad04b5b6f6eabe0372a32a8f1fbba5c130cae" + version "8.0.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.13.tgz#530f0f9254209b0335bf5cc6387822594ef47093" accessibility-developer-tools@^2.11.0: version "2.12.0" @@ -244,12 +258,16 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" +tslib@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" + util@^0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: inherits "2.0.1" -zone.js@0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.4.tgz#cc40ae5a1c879601c5ebba2096b5c80f0c4c3602" +zone.js@0.8.12: + version "0.8.12" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.12.tgz#86ff5053c98aec291a0bf4bbac501d694a05cfbb" diff --git a/terminus-core/package.json b/terminus-core/package.json index 69a5f1eb..3b0d638b 100644 --- a/terminus-core/package.json +++ b/terminus-core/package.json @@ -17,7 +17,6 @@ "author": "Eugene Pankov", "license": "MIT", "devDependencies": { - "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22", "@types/js-yaml": "^3.9.0", "@types/node": "^7.0.37", "@types/webpack-env": "^1.13.0", diff --git a/terminus-core/src/components/appRoot.component.ts b/terminus-core/src/components/appRoot.component.ts index 6d91b0fc..31fd6763 100644 --- a/terminus-core/src/components/appRoot.component.ts +++ b/terminus-core/src/components/appRoot.component.ts @@ -27,9 +27,16 @@ import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api' 'flex-basis': '1px', 'width': '1px', }), - animate('250ms ease-in-out') + animate('250ms ease-in-out', style({ + 'flex-basis': '200px', + 'width': '200px', + })) ]), transition(':leave', [ + style({ + 'flex-basis': '200px', + 'width': '200px', + }), animate('250ms ease-in-out', style({ 'flex-basis': '1px', 'width': '1px', diff --git a/terminus-core/src/components/baseTab.component.ts b/terminus-core/src/components/baseTab.component.ts index 1e24a7d1..d7794a4f 100644 --- a/terminus-core/src/components/baseTab.component.ts +++ b/terminus-core/src/components/baseTab.component.ts @@ -1,10 +1,11 @@ -import { Subject, BehaviorSubject } from 'rxjs' +import { Subject } from 'rxjs' import { ViewRef } from '@angular/core' export abstract class BaseTabComponent { private static lastTabID = 0 id: number - title$ = new BehaviorSubject(null) + title: string + customTitle: string scrollable: boolean hasActivity = false focused$ = new Subject() @@ -33,6 +34,5 @@ export abstract class BaseTabComponent { destroy (): void { this.focused$.complete() this.blurred$.complete() - this.title$.complete() } } diff --git a/terminus-core/src/components/tabHeader.component.pug b/terminus-core/src/components/tabHeader.component.pug index c4eaf3bc..4707c9bf 100644 --- a/terminus-core/src/components/tabHeader.component.pug +++ b/terminus-core/src/components/tabHeader.component.pug @@ -1,3 +1,3 @@ .index {{index + 1}} -.name {{tab.title$ | async}} +.name {{tab.title || tab.customTitle}} button((click)='closeClicked.emit()') × diff --git a/terminus-core/src/components/tabHeader.component.ts b/terminus-core/src/components/tabHeader.component.ts index f0c65524..1392b28a 100644 --- a/terminus-core/src/components/tabHeader.component.ts +++ b/terminus-core/src/components/tabHeader.component.ts @@ -1,5 +1,7 @@ import { Component, Input, Output, EventEmitter, HostBinding, HostListener } from '@angular/core' -import { BaseTabComponent } from '../components/baseTab.component' +import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { BaseTabComponent } from './baseTab.component' +import { RenameTabModalComponent } from './renameTabModal.component' @Component({ selector: 'tab-header', @@ -13,8 +15,17 @@ export class TabHeaderComponent { @Input() tab: BaseTabComponent @Output() closeClicked = new EventEmitter() - @HostListener('auxclick', ['$event']) onClick ($event: MouseEvent): void { - if ($event.which == 2) { + constructor ( + private ngbModal: NgbModal, + ) { } + + @HostListener('dblclick') onDoubleClick (): void { + let modal = this.ngbModal.open(RenameTabModalComponent) + modal.componentInstance.value = this.tab.customTitle || this.tab.title + } + + @HostListener('auxclick', ['$event']) onAuxClick ($event: MouseEvent): void { + if ($event.which === 2) { this.closeClicked.emit() } } diff --git a/terminus-core/src/index.ts b/terminus-core/src/index.ts index 21697a09..9c64e3ea 100644 --- a/terminus-core/src/index.ts +++ b/terminus-core/src/index.ts @@ -21,6 +21,7 @@ import { StartPageComponent } from './components/startPage.component' import { TabHeaderComponent } from './components/tabHeader.component' import { TitleBarComponent } from './components/titleBar.component' import { WindowControlsComponent } from './components/windowControls.component' +import { RenameTabModalComponent } from './components/renameTabModal.component' import { HotkeyProvider } from './api/hotkeyProvider' import { ConfigProvider } from './api/configProvider' @@ -63,7 +64,11 @@ const PROVIDERS = [ TabHeaderComponent, TitleBarComponent, WindowControlsComponent, + RenameTabModalComponent, ], + entryComponents: [ + RenameTabModalComponent, + ] }) export default class AppModule { static forRoot (): ModuleWithProviders { diff --git a/terminus-settings/src/components/settingsTab.component.ts b/terminus-settings/src/components/settingsTab.component.ts index e3733121..00b83c93 100644 --- a/terminus-settings/src/components/settingsTab.component.ts +++ b/terminus-settings/src/components/settingsTab.component.ts @@ -27,7 +27,7 @@ export class SettingsTabComponent extends BaseTabComponent { ) { super() this.hotkeyDescriptions = hotkeyProviders.map(x => x.hotkeys).reduce((a, b) => a.concat(b)) - this.title$.next('Settings') + this.title = 'Settings' this.scrollable = true this.screens = this.docking.getScreens() } diff --git a/terminus-terminal/src/components/terminalTab.component.ts b/terminus-terminal/src/components/terminalTab.component.ts index 9cb5d786..73f1d0af 100644 --- a/terminus-terminal/src/components/terminalTab.component.ts +++ b/terminus-terminal/src/components/terminalTab.component.ts @@ -47,7 +47,7 @@ export class TerminalTabComponent extends BaseTabComponent { ) { super() this.decorators = this.decorators || [] - this.title$.next('Terminal') + this.title = 'Terminal' this.configSubscription = config.changed$.subscribe(() => { this.configure() }) @@ -143,7 +143,7 @@ export class TerminalTabComponent extends BaseTabComponent { attachHTermHandlers (hterm: any) { hterm.setWindowTitle = (title) => { this.zone.run(() => { - this.title$.next(title) + this.title = title }) }