Merge pull request #46 from xsolla/PAYMENTS-18763

fix [PAYMENTS-18763]: fix mobile window close handler
xsolla · Apr 17, 2024 · 0687d41 · 0687d41
2 parents 41ac22c + a4966c6
commit 0687d41
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.2.11
+- [fix] Fixed mobile window close handler (PS 4)
+
 ## 1.2.10
 - [feature] Add new event - error (PS 4)
 

diff --git a/dist/widget.js b/dist/widget.js
diff --git a/dist/widget.min.js b/dist/widget.min.js
diff --git a/dist/widget.min.js.map b/dist/widget.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xsolla-paystation-widget",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "description": "PayStation 3 Integration Widget",
   "scripts": {
     "build": "gulp build",

diff --git a/src/childwindow.js b/src/childwindow.js
@@ -34,16 +34,18 @@ module.exports = (function () {
 
         var that = this;
         var addHandlers = function () {
-            that.on('close', function handleClose() {
+            function closeChildWindow() {
+                that.off('close', closeChildWindow)
+
                 if (timer) {
                     global.clearTimeout(timer);
                 }
                 if (that.childWindow) {
                     that.childWindow.close();
                 }
+            }
 
-                that.off('close', handleClose)
-            });
+            that.on('close', closeChildWindow);
 
             // Cross-window communication
             that.message = new PostMessage(that.childWindow);
@@ -58,9 +60,9 @@ module.exports = (function () {
             that.message.on('status', function (event) {
                 that.triggerEvent('status', event.detail);
             });
-            that.on('close', function handleClose() {
-                that.message.off();
-                that.off('close', handleClose);
+            that.message.on('close', function handleClose() {
+                closeChildWindow();
+                that.message.off('close', handleClose);
             });
             that.message.on('user-country', function (event) {
                 that.triggerEvent('user-country', event.detail);