feat(infinite-scroll): it can be enabled/disabled from a ng input

references ionic-team#8380
manucorporat · Oct 1, 2016 · 49f4dd3 · 49f4dd3
1 parent 21eae2e
commit 49f4dd3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/demos/src/infinite-scroll/app.component.ts b/demos/src/infinite-scroll/app.component.ts
@@ -82,7 +82,7 @@ export class ApiDemoApp {
       infiniteScroll.complete();
 
       if (this.items.length > 90) {
-        infiniteScroll.enable(false);
+        infiniteScroll.enabled = false;
       }
     });
   }

diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts
@@ -131,6 +131,26 @@ export class InfiniteScroll {
     }
   }
 
+  /**
+   * @input {boolean} Whether or not the infinite scroll should be
+   * enabled or not. Setting to `false` will remove scroll event listeners
+   * and hide the display.
+   *
+   * Call `enable = false` to disable the infinite scroll from actively
+   * trying to receive new data while scrolling. This method is useful
+   * when it is known that there is no more data that can be added, and
+   * the infinite scroll is no longer needed.
+   */
+  @Input()
+  get enabled(): boolean {
+    return this.state !== STATE_DISABLED;
+  }
+
+  set enabled(shouldEnable: boolean) {
+    this.state = (shouldEnable ? STATE_ENABLED : STATE_DISABLED);
+    this._setListeners(shouldEnable);
+  }
+
   /**
    * @output {event} The expression to call when the scroll reaches
    * the threshold distance. From within your infinite handler,
@@ -203,20 +223,6 @@ export class InfiniteScroll {
     this.state = STATE_ENABLED;
   }
 
-  /**
-   * Call `enable(false)` to disable the infinite scroll from actively
-   * trying to receive new data while scrolling. This method is useful
-   * when it is known that there is no more data that can be added, and
-   * the infinite scroll is no longer needed.
-   * @param {boolean} shouldEnable  If the infinite scroll should be
-   * enabled or not. Setting to `false` will remove scroll event listeners
-   * and hide the display.
-   */
-  enable(shouldEnable: boolean) {
-    this.state = (shouldEnable ? STATE_ENABLED : STATE_DISABLED);
-    this._setListeners(shouldEnable);
-  }
-
   _setListeners(shouldListen: boolean) {
     if (this._init) {
       if (shouldListen) {

diff --git a/src/components/infinite-scroll/test/basic/app-module.ts b/src/components/infinite-scroll/test/basic/app-module.ts
@@ -29,7 +29,7 @@ export class E2EPage1 {
 
       if (this.items.length > 90) {
         this.enabled = false;
-        infiniteScroll.enable(this.enabled);
+        infiniteScroll.enabled = this.enabled;
       }
     });
   }
@@ -40,7 +40,7 @@ export class E2EPage1 {
 
   toggleInfiniteScroll() {
     this.enabled = !this.enabled;
-    this.infiniteScroll.enable(this.enabled);
+    this.infiniteScroll.enabled = this.enabled;
   }
 }
 

diff --git a/src/components/infinite-scroll/test/short-list/app-module.ts b/src/components/infinite-scroll/test/short-list/app-module.ts
@@ -26,7 +26,7 @@ export class E2EPage {
       infiniteScroll.complete();
 
       if (this.items.length > 90) {
-        infiniteScroll.enable(false);
+        infiniteScroll.enabled = false;
       }
     });
   }