From 4ee993025dd51e087993abc086fef45419eee400 Mon Sep 17 00:00:00 2001
From: Jaakko Manninen <kschzt@gmail.com>
Date: Tue, 20 Feb 2018 19:21:59 +0200
Subject: [PATCH] removeEventListener with used binds

---
 src/keyboard/index.js | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/keyboard/index.js b/src/keyboard/index.js
index 6f7f10e..d8a8aee 100755
--- a/src/keyboard/index.js
+++ b/src/keyboard/index.js
@@ -32,6 +32,14 @@ AFRAME.registerComponent('keyboard', {
     this.el.alphabeticalLayout = Draw.alphabeticalLayout();
     this.el.symbolsLayout = Draw.symbolsLayout();
 
+    // Bind event listener scopes
+    this.inputEvent = this.inputEvent.bind(this)
+    this.backspaceEvent = this.backspaceEvent.bind(this)
+    this.dismissEvent = this.dismissEvent.bind(this)
+    this.keydownEvent = this.keydownEvent.bind(this)
+    this.didFocusInputEvent = this.didFocusInputEvent.bind(this)
+    this.didBlurInputEvent = this.didBlurInputEvent.bind(this)
+
     // Append layouts to UI
     numericalUI.appendChild( Draw.numericalLayout() );
     mainUI.appendChild( this.el.alphabeticalLayout );
@@ -54,14 +62,14 @@ AFRAME.registerComponent('keyboard', {
     this.el.setAttribute("position", "-1.5 -0.3 -2");
 
     // Register keyboard events
-    this.el.addEventListener('input', this.inputEvent.bind(this));
-    this.el.addEventListener('backspace', this.backspaceEvent.bind(this));
-    this.el.addEventListener('dismiss', this.dismissEvent.bind(this));
+    this.el.addEventListener('input', this.inputEvent);
+    this.el.addEventListener('backspace', this.backspaceEvent);
+    this.el.addEventListener('dismiss', this.dismissEvent);
 
     // Register global events
-    document.addEventListener('keydown', this.keydownEvent.bind(this));
-    document.body.addEventListener('didfocusinput', this.didFocusInputEvent.bind(this));
-    document.body.addEventListener('didblurinput', this.didBlurInputEvent.bind(this));
+    document.addEventListener('keydown', this.keydownEvent);
+    document.body.addEventListener('didfocusinput', this.didFocusInputEvent);
+    document.body.addEventListener('didblurinput', this.didBlurInputEvent);
   },
   update: function () {
     if (this.data.isOpen) {
@@ -72,13 +80,13 @@ AFRAME.registerComponent('keyboard', {
   },
   tick: function () {},
   remove: function () {
-    this.el.removeEventListener('input', this.inputEvent.bind(this));
-    this.el.removeEventListener('backspace', this.backspaceEvent.bind(this));
-    this.el.removeEventListener('dismiss', this.dismissEvent.bind(this));
+    this.el.removeEventListener('input', this.inputEvent);
+    this.el.removeEventListener('backspace', this.backspaceEvent);
+    this.el.removeEventListener('dismiss', this.dismissEvent);
 
-    document.removeEventListener('keydown', this.keydownEvent.bind(this));
-    document.body.removeEventListener('didfocusinput', this.didFocusInputEvent.bind(this));
-    document.body.removeEventListener('didblurinput', this.didBlurInputEvent.bind(this));
+    document.removeEventListener('keydown', this.keydownEvent);
+    document.body.removeEventListener('didfocusinput', this.didFocusInputEvent);
+    document.body.removeEventListener('didblurinput', this.didBlurInputEvent);
   },
   pause: function () {},
   play: function () {},