Skip to content

Commit

Permalink
feat(deps): upgrade to angular2 beta.15
Browse files Browse the repository at this point in the history
  • Loading branch information
valorkin committed Apr 15, 2016
1 parent 13b6319 commit 00e6ad4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions components/tooltip/tooltip-container.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const config = {
historyApiFallback: true,
contentBase: dest,
//publicPath: dest,
outputPath: dest,
watchOptions: {aggregateTimeout: 300, poll: 1000}
},

Expand Down

0 comments on commit 00e6ad4

Please sign in to comment.