Skip to content

stop opening click closing immediately #226

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stop opening click closing immediately #226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions addon/components/basic-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,26 @@ export default Component.extend({

this.sendAction('onClose');
};
const registerClick = () => $(document).on(`click.ember-modal-dialog-${guidFor(this)}`, handleClick);

// setTimeout needed or else the click handler will catch the click that spawned this modal dialog
setTimeout(registerClick);

if (this.get('isIOS')) {
const registerTouch = () => $(document).on(`touchend.ember-modal-dialog-${guidFor(this)}`, handleClick);
setTimeout(registerTouch);
}
// run next so that the opening click doesn't immediately close us
Ember.run.next(() => {
if (!this.get("isDestroying") && !this.get("isDestroyed")) {
const document = $(document);
const guid = guidFor(this);
document.on(`click.ember-modal-dialog-${guid}`, handleClick);
if (this.get('isIOS')) {
document.on(`touchend.ember-modal-dialog-${guid}`, handleClick);
}
}
});
this._super(...arguments);
},

willDestroyElement() {
$(document).off(`click.ember-modal-dialog-${guidFor(this)}`);
const document = $(document);
const guid = guidFor(this);
document.off(`click.ember-modal-dialog-${guid}`);
if (this.get('isIOS')) {
$(document).off(`touchend.ember-modal-dialog-${guidFor(this)}`);
document.off(`touchend.ember-modal-dialog-${guid}`);
}
this._super(...arguments);
}
Expand Down