From ecd7f45b298ac2a622cf5f40b82a9bf332942c3a Mon Sep 17 00:00:00 2001 From: oscarni Date: Tue, 17 May 2016 11:33:34 +0200 Subject: [PATCH] Register unique clickOutSideToClose click handlers Prevents removal of the wrong listener when multiple dialogs are on the same page. --- addon/components/modal-dialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/components/modal-dialog.js b/addon/components/modal-dialog.js index a13f66cf..246a39cd 100644 --- a/addon/components/modal-dialog.js +++ b/addon/components/modal-dialog.js @@ -61,14 +61,14 @@ export default Ember.Component.extend({ this.send('close'); } }; - const registerClick = () => $(document).on('click.ember-modal-dialog', handleClick); + const registerClick = () => $(document).on('click.ember-modal-dialog' + this.get('elementId'), handleClick); // setTimeout needed or else the click handler will catch the click that spawned this modal dialog setTimeout(registerClick); this._super(...arguments); }, willDestroyElement() { - $(document).off('click.ember-modal-dialog'); + $(document).off('click.ember-modal-dialog' + this.get('elementId')); this._super(...arguments); },