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.

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

Support close on mouseleave for tether dialog #130

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
try breaking asserts out into separate test functions
BrianSipple authored and BrianSipple committed May 24, 2016
commit 183a77358f7f8510ea2648b740e5872404542c37
2 changes: 1 addition & 1 deletion addon/components/tether-dialog.js
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ export default ModalDialog.extend({
this._super(...arguments);

if (this.get('mouseleaveToClose')) {
this._eventListenerNameSpace = `ember-modal-dialog.${this._mouseLeaveEventId}`;
this._eventListenerNameSpace = `ember-modal-dialog.${this.elementId}`;

Ember.$('.ember-modal-dialog').on(`mouseleave.${this._eventListenerNameSpace}`, (event) => {
// DON'T close if the mouse is leaving the target and entering the target
28 changes: 18 additions & 10 deletions tests/acceptance/tether-dialog-test.js
Original file line number Diff line number Diff line change
@@ -114,7 +114,7 @@ test('target - view', function(assert) {
});
});

test('mouseleaveToClose', function(assert) {
test('mouseleaveToClose functions with manual close button', function(assert) {
const openSelector = '#targetedMouseleaveToClose';
const dialogText = 'Target w/ mouseleaveToClose';

@@ -125,16 +125,24 @@ test('mouseleaveToClose', function(assert) {
hasOverlay: false,
tethered: true
});
});

test('mouseleaveToClose closes when a mouseleave event occurs on the dialog', function(assert) {
const openSelector = '#targetedMouseleaveToClose';
const dialogText = 'Target w/ mouseleaveToClose';

click(openSelector)
.then(() => {
return assert.closesOnMouseleave(dialogSelector, dialogText);
})
.then(() => {
click(openSelector).then(() => {
assert.closesOnMouseleave(openSelector, dialogText);
});
});
click(openSelector).then(() => {
return assert.closesOnMouseleave(dialogSelector, dialogText);
});
});

test('mouseleaveToClose closes when a mouseleave event occurs on the element used to open', function(assert) {
const openSelector = '#targetedMouseleaveToClose';
const dialogText = 'Target w/ mouseleaveToClose';

click(openSelector).then(() => {
return assert.closesOnMouseleave(openSelector, dialogText);
});
});

test('subclassed modal', function(assert) {
3 changes: 2 additions & 1 deletion tests/helpers/modal-asserts.js
Original file line number Diff line number Diff line change
@@ -42,7 +42,8 @@ export default function registerAssertHelpers() {

assert.closesOnMouseleave = function(mouseLeaveSelector, dialogText) {
const dialogContent = [dialogSelector, `:contains(${dialogText})`].join('');
return triggerEvent(dialogContent, 'mouseleave').then(() => {

return triggerEvent(mouseLeaveSelector, 'mouseleave').then(() => {
this.isAbsent(dialogContent);
});
};