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

magento-engcom-team · magento-engcom-team · commit aebee510ccd8 · 2018-07-28T18:08:21.000-05:00
- Merge Pull Request #17223 from gelanivishal/magento2:2.1-develop-PR-port-16477 - Merged commits: 1. b50caeb 2. 540cdb5 3. d937ca7
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);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,10 @@ define([`
`77`	`77`	`confirm: function () {`
`78`	`78`	`self._removeItem($(event.currentTarget));`
`79`	`79`	`},`
`80`		`- always: function (event) {`
`81`		`- event.stopImmediatePropagation();`
	`80`	`+`
	`81`	`+ /** @inheritdoc */`
	`82`	`+ always: function (e) {`
	`83`	`+ e.stopImmediatePropagation();`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`	`});`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,12 @@ define([`
`100`	`100`	`/**`
`101`	`101`	`* Escape key press handler,`
`102`	`102`	`* close modal window`
	`103`	`+ * @param {Object} event - event`
`103`	`104`	`*/`
`104`		`- escapeKey: function () {`
	`105`	`+ escapeKey: function (event) {`
`105`	`106`	`if (this.options.isOpen && this.modal.find(document.activeElement).length \|\|`
`106`	`107`	`this.options.isOpen && this.modal[0] === document.activeElement) {`
`107`		`- this.closeModal();`
	`108`	`+ this.closeModal(event);`
`108`	`109`	`}`
`109`	`110`	`}`
`110`	`111`	`}`