Forgot removeRAF in recursive fn (#188)

DockYard · Apr 23, 2019 · 2e5af37 · 2e5af37
1 parent d1ba79c
commit 2e5af37
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/addon/-private/raf-admin.js b/addon/-private/raf-admin.js
@@ -123,7 +123,8 @@ export function startRAF(
           { scrollableArea, viewportTolerance, viewportSpy },
           enterCallback,
           exitCallback,
-          addRAF
+          addRAF,
+          removeRAF
         )
       );
     } else {

diff --git a/addon/services/in-viewport.js b/addon/services/in-viewport.js
@@ -67,16 +67,16 @@ export default class InViewport extends Service {
           const {
             enterCallback = noop,
             exitCallback = noop
-          } = get(this, 'rafAdmin').getCallbacks(element) || {};
+          } = this.getCallbacks(element) || {};
           // this isn't using the same functions as the mixin case, but that is b/c it is a bit harder to unwind.
           // So just rewrote it with pure functions for now
           startRAF(
             element,
             configOptions,
             enterCallback,
             exitCallback,
-            this.addRAF.bind(this, element.elementId),
-            this.removeRAF.bind(this, element.elementId)
+            this.addRAF.bind(this, element.id),
+            this.removeRAF.bind(this, element.id)
           );
         });
       }
@@ -111,6 +111,10 @@ export default class InViewport extends Service {
     }
   }
 
+  getCallbacks(target) {
+    return get(this, 'rafAdmin').getCallbacks(target);
+  }
+
   /** IntersectionObserver **/
 
   /**