Fix for RN check if addEventListener & removeEventListener are availa…

…ble (#34) * Fix for RN check if addEventListener & removeEventListener are available * add checks to cross-tab-client.js as well * add checks to confirm.js
logux · Nov 5, 2019 · 14504f0 · 14504f0
1 parent 88b6b01
commit 14504f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/client.js b/client.js
@@ -336,7 +336,7 @@ function Client (options) {
   })
 
   this.onUnload = this.onUnload.bind(this)
-  if (typeof window !== 'undefined') {
+  if (typeof window !== 'undefined' && window.addEventListener) {
     window.addEventListener('unload', this.onUnload)
   }
 }
@@ -392,7 +392,7 @@ Client.prototype = {
     this.onUnload()
     this.node.destroy()
     clearInterval(this.pinging)
-    if (typeof window !== 'undefined') {
+    if (typeof window !== 'undefined' && window.removeEventListener) {
       window.removeEventListener('unload', this.onUnload)
     }
   },

diff --git a/confirm.js b/confirm.js
@@ -27,10 +27,12 @@ function confirm (client) {
       wait = false
     }
 
-    if (client.role !== 'follower' && wait && disconnected) {
-      window.addEventListener('beforeunload', block)
-    } else {
-      window.removeEventListener('beforeunload', block)
+    if (typeof window !== 'undefined' && window.addEventListener) {
+      if (client.role !== 'follower' && wait && disconnected) {
+        window.addEventListener('beforeunload', block)
+      } else {
+        window.removeEventListener('beforeunload', block)
+      }
     }
   }
 

diff --git a/cross-tab-client.js b/cross-tab-client.js
@@ -208,7 +208,7 @@ function CrossTabClient (options) {
 
   this.onStorage = this.onStorage.bind(this)
   this.onUnload = this.onUnload.bind(this)
-  if (typeof window !== 'undefined') {
+  if (typeof window !== 'undefined' && window.addEventListener) {
     window.addEventListener('storage', this.onStorage)
     window.addEventListener('unload', this.onUnload)
   }
@@ -240,7 +240,7 @@ CrossTabClient.prototype = {
     clearTimeout(this.watching)
     clearTimeout(this.elections)
     clearInterval(this.leadership)
-    if (typeof window !== 'undefined') {
+    if (typeof window !== 'undefined' && window.removeEventListener) {
       window.removeEventListener('storage', this.onStorage)
     }
   },