Skip to content

fixed issue #18458 : Alert widget gets close when click anywhere on screen #18576 #18865

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

Merged
merged 11 commits into from
Oct 29, 2018
Merged

fixed issue #18458 : Alert widget gets close when click anywhere on screen #18576 #18865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f59bc17
fixed issue #18082
Oct 8, 2018
06b243f
update branch
Oct 17, 2018
c3bc361
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
Oct 22, 2018
26a9520
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
Oct 23, 2018
87167e7
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
Oct 25, 2018
c6586ab
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
Oct 25, 2018
d40a26c
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
Oct 26, 2018
84c7391
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
Oct 26, 2018
e1483f6
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
Oct 27, 2018
3b2e4e4
Merge branch '2.2-develop' of github.com:Shubham-Webkul/magento2 into…
Oct 27, 2018
7dc2d1b
fixed issue #18458
Oct 27, 2018
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-component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ define([
* @returns {Object} Chainable.
*/
initModalEvents: function () {
this.options.keyEventHandlers.escapeKey = this.options.outerClickHandler = this[this.onCancel].bind(this);
this.options.keyEventHandlers.escapeKey = this[this.onCancel].bind(this);

return this;
},
Expand Down
4 changes: 1 addition & 3 deletions 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 @@ -424,8 +424,7 @@ define([
* Creates overlay, append it to wrapper, set previous click event on overlay.
*/
_createOverlay: function () {
var events,
outerClickHandler = this.options.outerClickHandler || this.closeModal;
var events;

this.overlay = $('.' + this.options.overlayClass);

Expand All @@ -437,7 +436,6 @@ define([
}
events = $._data(this.overlay.get(0), 'events');
events ? this.prevOverlayHandler = events.click[0].handler : false;
this.options.clickableOverlay ? this.overlay.unbind().on('click', outerClickHandler) : false;
},

/**
Expand Down