Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue when escape key is pressed to close prompt #25349

Merged
merged 23 commits into from
Feb 26, 2020
Merged

Fixed issue when escape key is pressed to close prompt #25349

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a4a2ff7
Fixed issue when esacpe key is pressed to close prompt
konarshankar07 Oct 29, 2019
c42d48a
Fixed static test
konarshankar07 Nov 5, 2019
b8e0c42
magento/magento2#25349: Fixed static tests
sivaschenko Nov 11, 2019
d6995f7
Fixed issue with prompt closed on pressing escape key instead of hiding
konarshankar07 Nov 14, 2019
c9f9757
Merge branch 'escapekey-issue-onprompt-close' of https://github.com/k…
konarshankar07 Nov 14, 2019
240fc19
Fixed static build test
konarshankar07 Nov 14, 2019
da6b361
Reverted changes fix for modal and fixed the e.stopImmediatePropagati…
konarshankar07 Nov 26, 2019
db51191
Fixed static test
konarshankar07 Nov 26, 2019
3e25bd1
Fixed always function issue
konarshankar07 Nov 30, 2019
633ea17
Added missing parameter description
konarshankar07 Dec 3, 2019
5d676b6
Merge branch '2.4-develop' into escapekey-issue-onprompt-close
konarshankar07 Dec 17, 2019
997959f
Fixed prompt issue with latest updates
konarshankar07 Dec 17, 2019
d3aa932
Merge branch '2.4-develop' into escapekey-issue-onprompt-close
konarshankar07 Jan 26, 2020
65b2afe
Feedback changes
konarshankar07 Jan 26, 2020
727679d
Merge branch '2.4-develop' into escapekey-issue-onprompt-close
konarshankar07 Feb 6, 2020
b41ea13
Feedback changes
konarshankar07 Feb 7, 2020
552eaaf
event is used in the closeModal body
konarshankar07 Feb 7, 2020
ce6614e
event is passed to the always method
konarshankar07 Feb 7, 2020
c14fbed
Merge branch '2.4-develop' into escapekey-issue-onprompt-close
konarshankar07 Feb 14, 2020
257eb00
Merge branch '2.4-develop' into escapekey-issue-onprompt-close
konarshankar07 Feb 15, 2020
b1ab6a9
static test fix
Nazar65 Feb 18, 2020
53fe8ee
Merge branch '2.4-develop' of https://github.com/magento/magento2 int…
Nazar65 Feb 18, 2020
437fab3
static test fix
Nazar65 Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/js/modal/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ define([
var key = keyCodes[event.keyCode];

if (this.options.keyEventHandlers.hasOwnProperty(key)) {
this.options.keyEventHandlers[key].apply(this, arguments);
this.options.keyEventHandlers[key].apply(this, arguments, event);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, revert these changes. Apply function doesn't accept the third argument.

}
},

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Ui/view/base/web/js/modal/prompt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ define([
*/
closeModal: function (result) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modify these functions to accept the event as an argument and use it in closeModal function call as a first argument(same as in confirm.js). After that, start accepting in closeModal event as first argument and result as second(example).

var value;

if (result) {
if (result && !(result instanceof $.Event)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of the instanceof check?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, Initially we are passing only event so when this if condition is executed then result is taking as true so I've additional condition added that result should be instance of the event but I think we don't need now cause I have added condition if result is not passed then result will take as false

if (this.options.validation && !this.validate()) {
return false;
}
Expand All @@ -177,3 +176,4 @@ define([
return $('<div class="prompt-message"></div>').html(config.content).prompt(config);
};
});