From 46c031b35ddc604290be0719d2ee97d32cbd5776 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 29 Aug 2017 23:53:00 +0700
Subject: [PATCH] Fix endless interval

---
 client/coral-framework/components/Popup.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/components/Popup.js b/client/coral-framework/components/Popup.js
index 1fe3408ea..33041442f 100644
--- a/client/coral-framework/components/Popup.js
+++ b/client/coral-framework/components/Popup.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 export default class Popup extends Component {
   ref = null;
   detectCloseInterval = null;
+  resetCallbackInterval = null;
 
   constructor(props) {
     super(props);
@@ -41,16 +42,26 @@ export default class Popup extends Component {
     this.ref.onunload = () => {
       this.onUnload();
 
-      const interval = setInterval(() => {
+      if (this.resetCallbackInterval) {
+        clearInterval(this.resetCallbackInterval);
+      }
+
+      this.resetCallbackInterval = setInterval(() => {
         if (this.ref && this.ref.onload === null) {
+          clearInterval(this.resetCallbackInterval);
+          this.resetCallbackInterval = null;
           this.setCallbacks();
-          clearInterval(interval);
         }
       }, 50);
 
+      if (this.detectCloseInterval) {
+        clearInterval(this.detectCloseInterval);
+      }
+
       this.detectCloseInterval = setInterval(() => {
         if (!this.ref || this.ref.closed) {
           clearInterval(this.detectCloseInterval);
+          this.detectCloseInterval = null;
           this.onClose();
         }
       }, 50);