Merge pull request #5 from gokatz/fix-handle-destroy-state

fix: component state issue
gokatz · Nov 13, 2018 · 97318df · 97318df
2 parents 6860f34 + e02304d
commit 97318df
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/addon/components/sloth-loader.js b/addon/components/sloth-loader.js
@@ -60,7 +60,7 @@ export default Component.extend({
 
     if ('requestIdleCallback' in window) {
       window.requestIdleCallback(() => {        
-        this.send('loadMoreData')
+        this._loadMoreData();
       }, { 
         /* 
           if requestIdleCallback is not fired withing the given `loadInterval`
@@ -74,7 +74,7 @@ export default Component.extend({
 
     // fallback to setTimeout
     setTimeout(() => {
-      this.send('loadMoreData')
+      this._loadMoreData();
     }, loadInterval);
   },
 
@@ -87,7 +87,7 @@ export default Component.extend({
     let scrollElement = this.get('_scrollElement');
     // start to load data on 2/3 scroll
     if (scrollElement.scrollTop > (scrollElement.scrollHeight / 3) * 2) {
-      this.send('loadMoreData');
+      this._loadMoreData();
     }
   },
 
@@ -139,19 +139,24 @@ export default Component.extend({
     this._super(...arguments);
   },
 
+  _loadMoreData() {
+    if (!this.get('isDestroyed')) {
+      this.send('loadMoreData')
+    }
+  },
+
   actions: {
     loadMoreData() {
 
       let { 
         data: entireData = [], 
         loadCount, 
         dataForCurrentView = [] ,
-        isDestroyed
-      } = this.getProperties('data', 'loadCount', 'dataForCurrentView', 'isDestroyed');
+      } = this.getProperties('data', 'loadCount', 'dataForCurrentView');
 
       let isDoneRenderingList = dataForCurrentView.length === entireData.length;
 
-      if (isDestroyed || isDoneRenderingList) {
+      if (isDoneRenderingList) {
         return;
       }