From 8399f63ab93c361349b4f681b3817e59ce35abc3 Mon Sep 17 00:00:00 2001
From: Alexander Kras'ko <0m3r.mail@gmail.com>
Date: Wed, 27 Jun 2018 16:56:34 +0300
Subject: [PATCH 1/3] Update sidebar.js

---
 app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 debb1acf90d4f..bd0d840ecca2e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -93,7 +93,9 @@ define([
 
                         /** @inheritdoc */
                         always: function (e) {
-                            e.stopImmediatePropagation();
+                            if (e && typeof e.stopImmediatePropagation === 'function') {
+                                e.stopImmediatePropagation();
+                            }
                         }
                     }
                 });

From a6a17d317255e472725fcec5e585154041c8de68 Mon Sep 17 00:00:00 2001
From: Alexander Kras'ko <alex@templates-master.com>
Date: Mon, 2 Jul 2018 10:02:03 +0300
Subject: [PATCH 2/3] Fix for #14593 (duo over)

---
 app/code/Magento/Ui/view/base/web/js/modal/modal.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 6c9b4b89bec7a..147a18c08c54c 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
@@ -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);
                     }
                 }
             }

From 21f85b47263ebcea478457bc8827e2620f8d90be Mon Sep 17 00:00:00 2001
From: Alexander Kras'ko <alex@templates-master.com>
Date: Mon, 2 Jul 2018 10:10:04 +0300
Subject: [PATCH 3/3] Restore sidebar.js

---
 app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 4 +---
 1 file changed, 1 insertion(+), 3 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
index bd0d840ecca2e..debb1acf90d4f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -93,9 +93,7 @@ define([
 
                         /** @inheritdoc */
                         always: function (e) {
-                            if (e && typeof e.stopImmediatePropagation === 'function') {
-                                e.stopImmediatePropagation();
-                            }
+                            e.stopImmediatePropagation();
                         }
                     }
                 });