diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index 34501bbeb107889899f1e26478fa41aadb772847..f503e5be641c3af6dcd5307842610dd3da77fd1c 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -53,6 +53,9 @@ define([ actions: { confirm: function () { self._removeItem($(event.currentTarget)); + }, + always: function (event) { + event.stopImmediatePropagation(); } } }); diff --git a/app/code/Magento/Ui/view/base/web/js/modal/confirm.js b/app/code/Magento/Ui/view/base/web/js/modal/confirm.js index 098cb8669741e15eedb8fb0df607a0658cec98f8..1a27b96413c173a9b126d0996e232eb684d7e262 100644 --- a/app/code/Magento/Ui/view/base/web/js/modal/confirm.js +++ b/app/code/Magento/Ui/view/base/web/js/modal/confirm.js @@ -40,8 +40,8 @@ define([ /** * Click handler. */ - click: function () { - this.closeModal(); + click: function (event) { + this.closeModal(event); } }, { text: $.mage.__('OK'), @@ -50,8 +50,8 @@ define([ /** * Click handler. */ - click: function () { - this.closeModal(true); + click: function (event) { + this.closeModal(event, true); } }] }, @@ -82,15 +82,15 @@ define([ /** * Close modal window. */ - closeModal: function (result) { + closeModal: function (event, result) { result = result || false; if (result) { - this.options.actions.confirm(); + this.options.actions.confirm(event); } else { - this.options.actions.cancel(); + this.options.actions.cancel(event); } - this.options.actions.always(); + this.options.actions.always(event); this.element.bind('confirmclosed', _.bind(this._remove, this)); return this._super(); diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js index b6dd6da1651a64bb521d938291867e90c6a8a1cd..23011d607cdadc301ee6cf4cebeb148b400c0260 100644 --- a/app/code/Magento/Ui/view/base/web/js/modal/modal.js +++ b/app/code/Magento/Ui/view/base/web/js/modal/modal.js @@ -78,8 +78,8 @@ define([ /** * Default action on button click */ - click: function () { - this.closeModal(); + click: function (event) { + this.closeModal(event); } }] },