Skip to content

Commit 3e25bd1

Browse files
Fixed always function issue
1 parent db51191 commit 3e25bd1

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ define([
9898

9999
/** @inheritdoc */
100100
always: function (e) {
101-
if (e) {
102-
e.stopImmediatePropagation();
103-
}
101+
e.stopImmediatePropagation();
104102
}
105103
}
106104
});

app/code/Magento/Ui/view/base/web/js/modal/modal.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ define([
105105
* Escape key press handler,
106106
* close modal window
107107
*/
108-
escapeKey: function () {
108+
escapeKey: function (event) {
109109
if (this.options.isOpen && this.modal.find(document.activeElement).length ||
110110
this.options.isOpen && this.modal[0] === document.activeElement) {
111-
this.closeModal();
111+
this.closeModal(event);
112112
}
113113
}
114114
}
@@ -177,7 +177,7 @@ define([
177177
var key = keyCodes[event.keyCode];
178178

179179
if (this.options.keyEventHandlers.hasOwnProperty(key)) {
180-
this.options.keyEventHandlers[key].apply(this, arguments);
180+
this.options.keyEventHandlers[key].apply(this, arguments, event);
181181
}
182182
},
183183

0 commit comments

Comments
 (0)