Merge pull request #64 from gigya/GMSP-12

Fixed a JavaScript error on certain Gigya submit events due to a conflict with Magento
gigya · Jun 5, 2019 · 046fa29 · 046fa29
2 parents 4498cea + eaaae56
commit 046fa29
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
@@ -15,6 +15,9 @@ var config = {
             'Magento_Customer/js/view/authentication-popup': {
                 'Gigya_GigyaIM/js/view/authentication-popup': true
             },
+            'Magento_Customer/js/customer-data': {
+                'Gigya_GigyaIM/js/customer-data': true
+            },
             'Magento_Checkout/js/view/authentication': {
                 'Gigya_GigyaIM/js/view/authentication': true
             },

diff --git a/view/frontend/templates/gigya_script.phtml b/view/frontend/templates/gigya_script.phtml
@@ -19,6 +19,7 @@ $scriptDomain = $this->helper('Gigya\GigyaIM\Helper\GigyaScriptHelper')->getGigy
 	var magento_user_logged_in = false;
 	var enable_login = true;
 	var gigya_enabled = <?php echo $block->isGigyaEnabled() ? 'true' : 'false'; ?>;
+	var gigya_login_in_progress = false;
 
 	var m;
 </script>

diff --git a/view/frontend/web/js/customer-data.js b/view/frontend/web/js/customer-data.js
@@ -0,0 +1,16 @@
+define(function () {
+    'use strict';
+
+    return function (Component) {
+        Component.reloadOriginal = Component.reload;
+        Component.reload = function (sectionNames, updateSectionId) {
+            if (typeof gigya_enabled !== "undefined" && gigya_enabled && gigya_login_in_progress == true) {
+                return;
+            }
+
+            return this.reloadOriginal(sectionNames, updateSectionId);
+        }
+
+        return Component;
+    }
+});
diff --git a/view/frontend/web/js/gigya_script.js b/view/frontend/web/js/gigya_script.js
@@ -124,6 +124,9 @@ define([
 			"login[]": "",
 			login_data: JSON.stringify(loginData)
 		};
+
+		gigya_login_in_progress = true;
+
 		gigyaMage2.Functions.gigyaAjaxSubmit(action, data, $('.gigya-loader-location'));
 	};