test(infinite-scroll): nested <ion-infinite-scroll>

references #10507
This commit is contained in:
Manu Mtz.-Almeida
2017-03-15 18:59:03 +01:00
parent 19302a9fbf
commit c236a4bf4b
3 changed files with 39 additions and 32 deletions

View File

@ -1,4 +1,4 @@
import { Directive, ElementRef, EventEmitter, Host, Input, NgZone, Output } from '@angular/core'; import { Directive, ElementRef, EventEmitter, Input, NgZone, Output } from '@angular/core';
import { Content, ScrollEvent } from '../content/content'; import { Content, ScrollEvent } from '../content/content';
import { DomController } from '../../platform/dom-controller'; import { DomController } from '../../platform/dom-controller';

View File

@ -3,9 +3,10 @@ import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../.
@Component({ @Component({
selector: 'my-content',
templateUrl: 'main.html' templateUrl: 'main.html'
}) })
export class E2EPage1 { export class MyContent {
@ViewChild(InfiniteScroll) infiniteScroll: InfiniteScroll; @ViewChild(InfiniteScroll) infiniteScroll: InfiniteScroll;
items: number[] = []; items: number[] = [];
enabled: boolean = true; enabled: boolean = true;
@ -42,6 +43,22 @@ export class E2EPage1 {
} }
@Component({
template: `
<ion-header>
<ion-toolbar>
<ion-title>Infinite Scroll</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<my-content></my-content>
</ion-content>
`
})
export class E2EPage1 {}
@Component({ @Component({
template: '<ion-content><button ion-button (click)="navCtrl.pop()">Pop</button></ion-content>' template: '<ion-content><button ion-button (click)="navCtrl.pop()">Pop</button></ion-content>'
}) })
@ -61,7 +78,8 @@ export class E2EApp {
declarations: [ declarations: [
E2EApp, E2EApp,
E2EPage1, E2EPage1,
E2EPage2 E2EPage2,
MyContent
], ],
imports: [ imports: [
IonicModule.forRoot(E2EApp) IonicModule.forRoot(E2EApp)
@ -70,7 +88,8 @@ export class E2EApp {
entryComponents: [ entryComponents: [
E2EApp, E2EApp,
E2EPage1, E2EPage1,
E2EPage2 E2EPage2,
MyContent
] ]
}) })
export class AppModule {} export class AppModule {}

View File

@ -1,13 +1,3 @@
<ion-header>
<ion-toolbar>
<ion-title>Infinite Scroll</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<p> <p>
InfiniteScroll is enabled: {{enabled}} InfiniteScroll is enabled: {{enabled}}
@ -29,5 +19,3 @@
loadingText="Loading more data..."> loadingText="Loading more data...">
</ion-infinite-scroll-content> </ion-infinite-scroll-content>
</ion-infinite-scroll> </ion-infinite-scroll>
</ion-content>