ENGCOM-2155: Fix for #14593 (second try #16431) #16477

magento-engcom-team · magento-engcom-team · commit 7b1b65d0f850 · 2018-07-02T02:33:17.000-05:00
- Merge Pull Request #16477 from 0m3r/magento2:2.2-develop - Merged commits: 1. 8399f63 2. a6a17d3 3. 21f85b4
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
@@ -104,11 +104,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
`@@ -104,11 +104,12 @@ define([`
`104`	`104`	`/**`
`105`	`105`	`* Escape key press handler,`
`106`	`106`	`* close modal window`
	`107`	`+ * @param {Object} event - event`
`107`	`108`	`*/`
`108`		`- escapeKey: function () {`
	`109`	`+ escapeKey: function (event) {`
`109`	`110`	`if (this.options.isOpen && this.modal.find(document.activeElement).length \|\|`
`110`	`111`	`this.options.isOpen && this.modal[0] === document.activeElement) {`
`111`		`- this.closeModal();`
	`112`	`+ this.closeModal(event);`
`112`	`113`	`}`
`113`	`114`	`}`
`114`	`115`	`}`