diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts index 86423d8f26..dfac48b118 100644 --- a/src/components/infinite-scroll/infinite-scroll.ts +++ b/src/components/infinite-scroll/infinite-scroll.ts @@ -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 { DomController } from '../../platform/dom-controller'; diff --git a/src/components/infinite-scroll/test/basic/app.module.ts b/src/components/infinite-scroll/test/basic/app.module.ts index a1b42f3684..2451eba8c0 100644 --- a/src/components/infinite-scroll/test/basic/app.module.ts +++ b/src/components/infinite-scroll/test/basic/app.module.ts @@ -3,9 +3,10 @@ import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../. @Component({ + selector: 'my-content', templateUrl: 'main.html' }) -export class E2EPage1 { +export class MyContent { @ViewChild(InfiniteScroll) infiniteScroll: InfiniteScroll; items: number[] = []; enabled: boolean = true; @@ -42,6 +43,22 @@ export class E2EPage1 { } +@Component({ + template: ` + + + Infinite Scroll + + + + + + +` +}) +export class E2EPage1 {} + + @Component({ template: 'Pop' }) @@ -61,7 +78,8 @@ export class E2EApp { declarations: [ E2EApp, E2EPage1, - E2EPage2 + E2EPage2, + MyContent ], imports: [ IonicModule.forRoot(E2EApp) @@ -70,7 +88,8 @@ export class E2EApp { entryComponents: [ E2EApp, E2EPage1, - E2EPage2 + E2EPage2, + MyContent ] }) export class AppModule {} diff --git a/src/components/infinite-scroll/test/basic/main.html b/src/components/infinite-scroll/test/basic/main.html index bcb3278046..264b8552f4 100644 --- a/src/components/infinite-scroll/test/basic/main.html +++ b/src/components/infinite-scroll/test/basic/main.html @@ -1,33 +1,21 @@ - - - Infinite Scroll - + + InfiniteScroll is enabled: {{enabled}} + - + + Toggle InfiniteScroll Enabled + - - - - - InfiniteScroll is enabled: {{enabled}} - - - - Toggle InfiniteScroll Enabled + + + {{ item }} + - - - {{ item }} - - - - - - - - - + + + +
+ InfiniteScroll is enabled: {{enabled}} +
- InfiniteScroll is enabled: {{enabled}} -