MAGETWO-52107: After clicking "X" sign on billing agreement pop up customer is redirected to PayPal

oshmyheliuk · oshmyheliuk · commit ea9044112cec · 2016-04-21T19:02:28.000+03:00
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/paypal-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/paypal-checkout.js
@@ -54,17 +54,16 @@ define([
                              * Cancel confirmation handler
                              *
                              */
-                            cancel: function () {
-                                self._redirect(returnUrl);
+                            cancel: function (event) {
+                                if (event && !$(event.target).hasClass('action-close')) {
+                                    self._redirect(returnUrl);
+                                }
                             }
                         }
                     });
-
-                    return false;
+                } else {
+                    this._redirect(returnUrl, originalForm);
                 }
-
-                this._redirect(returnUrl, originalForm);
-
             }, this));
         },
 

Original file line number	Diff line number	Diff line change
`@@ -54,17 +54,16 @@ define([`
`54`	`54`	`* Cancel confirmation handler`
`55`	`55`	`*`
`56`	`56`	`*/`
`57`		`- cancel: function () {`
`58`		`- self._redirect(returnUrl);`
	`57`	`+ cancel: function (event) {`
	`58`	`+ if (event && !$(event.target).hasClass('action-close')) {`
	`59`	`+ self._redirect(returnUrl);`
	`60`	`+ }`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`	`});`
`62`		`-`
`63`		`- return false;`
	`64`	`+ } else {`
	`65`	`+ this._redirect(returnUrl, originalForm);`
`64`	`66`	`}`
`65`		`-`
`66`		`- this._redirect(returnUrl, originalForm);`
`67`		`-`
`68`	`67`	`}, this));`
`69`	`68`	`},`
`70`	`69`