From 00e6ad46a84ea91c48d85efa4e574fadc247deab Mon Sep 17 00:00:00 2001 From: Dmitriy Shekhovtsov Date: Fri, 15 Apr 2016 12:29:02 +0300 Subject: [PATCH] feat(deps): upgrade to angular2 beta.15 --- components/tooltip/tooltip-container.component.ts | 4 ++-- package.json | 9 ++++----- webpack.config.js | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/tooltip/tooltip-container.component.ts b/components/tooltip/tooltip-container.component.ts index f9a86ddee5..97a976185a 100644 --- a/components/tooltip/tooltip-container.component.ts +++ b/components/tooltip/tooltip-container.component.ts @@ -58,7 +58,7 @@ export class TooltipContainer implements AfterViewInit { if (this.animation) { this.classMap.fade = true; } - // fix: why time out is really needed here? - setTimeout(() => this.cdr.markForCheck()); + + this.cdr.detectChanges(); } } diff --git a/package.json b/package.json index 7870c48c26..28787991c6 100644 --- a/package.json +++ b/package.json @@ -47,22 +47,21 @@ }, "homepage": "https://github.com/valor-software/ng2-bootstrap#readme", "dependencies": { - "angular2": "2.0.0-beta.14", + "angular2": "2.0.0-beta.15", "moment": "2.12.0" }, "peerDependencies": { - "angular2": "2.0.0-beta.14" + "angular2": "2.0.0-beta.15" }, "devDependencies": { "async": "1.5.2", "balanced-match": "0.4.0", "bootstrap": "3.3.6", - "codelyzer": "0.0.12", "compression-webpack-plugin": "0.3.1", "conventional-changelog": "1.1.0", "conventional-changelog-cli": "1.1.1", "conventional-github-releaser": "1.1.1", - "copy-webpack-plugin": "1.1.1", + "copy-webpack-plugin": "2.0.1", "cpy-cli": "1.0.0", "del": "2.2.0", "del-cli": "0.2.0", @@ -101,7 +100,7 @@ "require-dir": "0.3.0", "rxjs": "5.0.0-beta.2", "source-map-loader": "0.1.5", - "systemjs-builder": "0.15.14", + "systemjs-builder": "0.15.15", "ts-loader": "0.8.2", "tslint-config-valorsoft": "0.0.3", "typescript": "1.8.10", diff --git a/webpack.config.js b/webpack.config.js index 5741e3c251..7a51881e72 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -73,6 +73,7 @@ const config = { historyApiFallback: true, contentBase: dest, //publicPath: dest, + outputPath: dest, watchOptions: {aggregateTimeout: 300, poll: 1000} },