Merge branch '2.0' into windows-mode

This commit is contained in:
Brandy Carney
2016-03-03 13:12:52 -05:00
45 changed files with 558 additions and 296 deletions

View File

@ -98,7 +98,7 @@ export class Content extends Ion {
* ngAfterViewInit() {
* // Here 'my-content' is the ID of my ion-content
* this.content = this.app.getComponent('my-content');
* this.content.addScrollEventListener(this.myScroll);
* this.content.addScrollListener(this.myScroll);
* }
* myScroll() {
* console.info('They see me scrolling...');