Revert "Revert "Merge branch 'master' of https://github.com/driftyco/ionic""

This reverts commit 4a6086c1f8e756b86460697f685af0c8f81e3019.
This commit is contained in:
perry
2016-07-18 19:40:03 -05:00
parent 4a6086c1f8
commit 4f52135c13
86 changed files with 5592 additions and 3938 deletions

View File

@ -7,7 +7,7 @@ import {ionicBootstrap, InfiniteScroll, NavController} from '../../../../../src'
})
class E2EPage1 {
@ViewChild(InfiniteScroll) infiniteScroll: InfiniteScroll;
items = [];
items: number[] = [];
enabled: boolean = true;
constructor(private nav: NavController) {
@ -68,7 +68,7 @@ function getAsyncData(): Promise<any[]> {
return new Promise(resolve => {
setTimeout(() => {
let data = [];
let data: number[] = [];
for (var i = 0; i < 30; i++) {
data.push(i);
}