Adjust to RC4 changes.

Author: lujakob

package.json

@@ -8,25 +8,25 @@
     "ionic:serve": "ionic-app-scripts serve"
   },
   "dependencies": {
-    "@angular/common": "2.1.1",
-    "@angular/compiler": "2.1.1",
-    "@angular/compiler-cli": "2.1.1",
-    "@angular/core": "2.1.1",
-    "@angular/forms": "2.1.1",
-    "@angular/http": "2.1.1",
-    "@angular/platform-browser": "2.1.1",
-    "@angular/platform-browser-dynamic": "2.1.1",
-    "@angular/platform-server": "2.1.1",
+    "@angular/common": "2.2.1",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
+    "@angular/forms": "2.2.1",
+    "@angular/http": "2.2.1",
+    "@angular/platform-browser": "2.2.1",
+    "@angular/platform-browser-dynamic": "2.2.1",
+    "@angular/platform-server": "2.2.1",
     "@ionic/storage": "1.1.6",
-    "ionic-angular": "2.0.0-rc.3",
+    "ionic-angular": "2.0.0-rc.4",
     "ionic-native": "2.2.3",
     "ionicons": "3.0.0",
     "lodash": "^4.17.2",
     "rxjs": "5.0.0-beta.12",
     "zone.js": "0.6.26"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "0.0.45",
+    "@ionic/app-scripts": "0.0.48",
     "@types/lodash": "^4.14.41",
     "body-parser": "^1.15.2",
     "cors": "^2.8.1",

src/app/main.prod.ts

@@ -2,7 +2,7 @@ import {Directive, ElementRef, EventEmitter, Host, Input, NgZone, Output} from '
 
 import {clearNativeTimeout, nativeTimeout} from 'ionic-angular/util/dom';
 
-import {Content} from 'ionic-angular';
+import {Content,ScrollEvent} from 'ionic-angular';
 
 /**
  * @name InfiniteScroll
@@ -18,7 +18,7 @@ import {Content} from 'ionic-angular';
 export class TwoWayInfiniteScroll {
   _lastCheck:number = 0;
   _highestY:number = 0;
-  _scLsn:Function;
+  _scLsn:any;
   _thr:string = '1%';
   _thrPx:number = 1;
   _thrPc:number = 0;
@@ -127,9 +127,9 @@ export class TwoWayInfiniteScroll {
     }
 
     // on arrive bottom
-    //
+    // this value might be adjusted, depending on list item height and content container height
     let customOffset = 100;
-    let distanceFromInfinite = ((d.scrollHeight - infiniteHeight) - d.scrollTop) - reloadY + customOffset;
+    let distanceFromInfinite = ((d.scrollHeight - infiniteHeight) - d.scrollTop) - reloadY - customOffset;
 
     if (this.stateBottom === STATE_ENABLED && distanceFromInfinite < 0) {
       clearNativeTimeout(this._tmId);
@@ -209,16 +209,16 @@ export class TwoWayInfiniteScroll {
     // this._setListeners(shouldEnable);
   }
 
-  _setListeners(shouldListen:boolean) {
+  _setListeners(shouldListen: boolean) {
     if (this._init) {
       if (shouldListen) {
         if (!this._scLsn) {
-          this._zone.runOutsideAngular(() => {
-            this._scLsn = this._content.addScrollListener(this._onScroll.bind(this));
+          this._scLsn = this._content.ionScroll.subscribe((ev: ScrollEvent) => {
+            this._onScroll();
           });
         }
       } else {
-        this._scLsn && this._scLsn();
+        this._scLsn && this._scLsn.unsubscribe();
         this._scLsn = null;
       }
     }

src/app/main.dev.ts src/app/main.tssrc/app/main.dev.ts renamed to src/app/main.ts

@@ -112,7 +112,7 @@ export class HomePage {
   scrollContent(startIndex: number = 0) {
     let listItems = this.contentListParent.nativeElement.querySelectorAll('ion-item');
     let offsetTop = !!listItems[startIndex] && startIndex > 0 ? listItems[startIndex].offsetTop : 0;
-    this.content.scrollTo(0, offsetTop, 0);
+    this.content.scrollTo(0, offsetTop, 100);
   }
 
 }