From 2e5af37a912f0de6dcfab62f15dd4be135d07b91 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer@users.noreply.github.com>
Date: Tue, 23 Apr 2019 09:42:56 -0700
Subject: [PATCH] Forgot removeRAF in recursive fn (#188)

---
 addon/-private/raf-admin.js   |  3 ++-
 addon/services/in-viewport.js | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addon/-private/raf-admin.js b/addon/-private/raf-admin.js
index 90e51b4d..6b714260 100644
--- 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
index 44b280d5..a9c8320a 100644
--- a/addon/services/in-viewport.js
+++ b/addon/services/in-viewport.js
@@ -67,7 +67,7 @@ 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(
@@ -75,8 +75,8 @@ export default class InViewport extends Service {
             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 **/
 
   /**