This commit is contained in:
Eugene Pankov 2017-04-06 22:25:41 +02:00
parent 0abe1fbc9d
commit d84e915f69
5 changed files with 29 additions and 26 deletions

View File

@ -13,7 +13,7 @@ title-bar(*ngIf='!config.full().appearance.useNativeFrame && config.store.appear
.tabs-container .tabs-container
tab-header( tab-header(
*ngFor='let tab of app.tabs; let idx = index; trackBy: tab?.id', *ngFor='let tab of app.tabs; let idx = index',
[class.pre-selected]='idx == app.tabs.indexOf(app.activeTab) - 1', [class.pre-selected]='idx == app.tabs.indexOf(app.activeTab) - 1',
[class.post-selected]='idx == app.tabs.indexOf(app.activeTab) + 1', [class.post-selected]='idx == app.tabs.indexOf(app.activeTab) + 1',
[index]='idx', [index]='idx',

View File

@ -1,4 +1,5 @@
import { Component, Inject, trigger, style, animate, transition, state } from '@angular/core' import { Component, Inject } from '@angular/core'
import { trigger, style, animate, transition, state } from '@angular/animations'
import { ToasterConfig } from 'angular2-toaster' import { ToasterConfig } from 'angular2-toaster'
import { ElectronService } from 'services/electron' import { ElectronService } from 'services/electron'
@ -11,7 +12,7 @@ import { DockingService } from 'services/docking'
import { AppService, IToolbarButton, ToolbarButtonProvider } from 'api' import { AppService, IToolbarButton, ToolbarButtonProvider } from 'api'
import 'angular2-toaster/lib/toaster.css' import 'angular2-toaster/toaster.css'
import 'overrides.scss' import 'overrides.scss'
import 'global.less' import 'global.less'
import 'theme.scss' import 'theme.scss'
@ -127,9 +128,9 @@ export class AppRootComponent {
this.docking.dock() this.docking.dock()
} }
getLeftToolbarButtons (): IToolbarButton[] { return this.getToolbarButtons(false); } getLeftToolbarButtons (): IToolbarButton[] { return this.getToolbarButtons(false) }
getRightToolbarButtons (): IToolbarButton[] { return this.getToolbarButtons(true); } getRightToolbarButtons (): IToolbarButton[] { return this.getToolbarButtons(true) }
ngOnInit () { ngOnInit () {
/* /*

View File

@ -1,10 +1,9 @@
{ {
"name": "term", "name": "term",
"devDependencies": { "devDependencies": {
"@types/fs-promise": "^1.0.1",
"apply-loader": "^0.1.0", "apply-loader": "^0.1.0",
"autoprefixer": "^6.7.7", "autoprefixer": "^6.7.7",
"awesome-typescript-loader": "3.0.8", "awesome-typescript-loader": "3.1.2",
"css-loader": "0.26.1", "css-loader": "0.26.1",
"dataurl": "^0.1.0", "dataurl": "^0.1.0",
"deep-equal": "^1.0.1", "deep-equal": "^1.0.1",
@ -27,14 +26,14 @@
"sass-loader": "^6.0.3", "sass-loader": "^6.0.3",
"style-loader": "^0.13.1", "style-loader": "^0.13.1",
"to-string-loader": "^1.1.5", "to-string-loader": "^1.1.5",
"tslint": "4.5.0", "tslint": "5.0.0",
"tslint-eslint-rules": "^3.5.1", "tslint-eslint-rules": "4.0.0",
"typescript": "2.2.1", "typescript": "2.2.2",
"untildify": "^3.0.2", "untildify": "^3.0.2",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"val-loader": "^0.5.0", "val-loader": "^0.5.0",
"vrsource-tslint-rules": "^4.0.1", "vrsource-tslint-rules": "^4.0.1",
"webpack": "2.2.0", "webpack": "2.3.3",
"yaml-loader": "^0.4.0" "yaml-loader": "^0.4.0"
}, },
"build": { "build": {
@ -62,29 +61,31 @@
"dist": "build" "dist": "build"
}, },
"dependencies": { "dependencies": {
"@angular/common": "2.3.1", "@angular/animations": "4.0.0-rc.2",
"@angular/compiler": "2.3.1", "@angular/common": "4.0.0-rc.2",
"@angular/core": "2.3.1", "@angular/compiler": "4.0.0-rc.2",
"@angular/forms": "2.3.1", "@angular/core": "4.0.0-rc.2",
"@angular/http": "2.3.1", "@angular/forms": "4.0.0-rc.2",
"@angular/platform-browser": "2.3.1", "@angular/http": "4.0.0-rc.2",
"@angular/platform-browser-dynamic": "2.3.1", "@angular/platform-browser": "4.0.0-rc.2",
"@angular/platform-server": "2.3.1", "@angular/platform-browser-dynamic": "4.0.0-rc.2",
"@angular/router": "3.3.1", "@angular/platform-server": "4.0.0-rc.2",
"@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.15", "@angular/router": "4.0.0-rc.2",
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
"@types/fs-promise": "^1.0.1",
"@types/core-js": "^0.9.35", "@types/core-js": "^0.9.35",
"@types/electron": "1.4.34", "@types/electron": "1.4.34",
"@types/js-yaml": "^3.5.29", "@types/js-yaml": "^3.5.29",
"@types/node": "^7.0.5", "@types/node": "^7.0.5",
"angular2-perfect-scrollbar": "^1.1.0", "angular2-perfect-scrollbar": "2.0.0",
"angular2-toaster": "^1.1.0", "angular2-toaster": "3.0.1",
"bootstrap": "4.0.0-alpha.6", "bootstrap": "4.0.0-alpha.6",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"deepmerge": "^1.3.2", "deepmerge": "^1.3.2",
"hterm-commonjs": "^1.0.0", "hterm-commonjs": "^1.0.0",
"jquery": "^3.1.1", "jquery": "^3.1.1",
"rxjs": "5.0.0-rc.4", "rxjs": "5.3.0",
"source-sans-pro": "^2.0.10", "source-sans-pro": "^2.0.10",
"zone.js": "0.7.2" "zone.js": "0.8.5"
} }
} }

View File

@ -17,6 +17,7 @@
"lib": [ "lib": [
"dom", "dom",
"es2015", "es2015",
"es2015.iterable.ts",
"es7" "es7"
] ]
}, },

View File

@ -10,7 +10,7 @@ module.exports = {
}, },
devtool: 'source-map', devtool: 'source-map',
output: { output: {
path: 'app/assets/webpack', path: path.join(__dirname, 'app', 'assets', 'webpack'),
pathinfo: true, pathinfo: true,
//publicPath: 'assets/webpack/', //publicPath: 'assets/webpack/',
filename: '[name].js' filename: '[name].js'