ENGCOM-2595: [Backport] Fix for #14593 (second try #16431) #17223

- Merge Pull Request #17223 from gelanivishal/magento2:2.1-develop-PR-port-16477 - Merged commits: 1. b50caeb 2. 540cdb5 3. d937ca7
magento · Jul 28, 2018 · aebee51 · aebee51
2 parents f06f52c + d937ca7
commit aebee51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -77,8 +77,10 @@ define([
                         confirm: function () {
                             self._removeItem($(event.currentTarget));
                         },
-                        always: function (event) {
-                            event.stopImmediatePropagation();
+
+                        /** @inheritdoc */
+                        always: function (e) {
+                            e.stopImmediatePropagation();
                         }
                     }
                 });

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
@@ -100,11 +100,12 @@ define([
                 /**
                  * Escape key press handler,
                  * close modal window
+                 * @param {Object} event - event
                  */
-                escapeKey: function () {
+                escapeKey: function (event) {
                     if (this.options.isOpen && this.modal.find(document.activeElement).length ||
                         this.options.isOpen && this.modal[0] === document.activeElement) {
-                        this.closeModal();
+                        this.closeModal(event);
                     }
                 }
             }