Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

fix(tooltip): fix binding to multiple triggers #4384

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 6 additions & 2 deletions src/tooltip/test/tooltip.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ describe('$tooltipProvider', function() {

describe('triggers with a custom mapped value', function() {
beforeEach(module('ui.bootstrap.tooltip', function($tooltipProvider) {
$tooltipProvider.setTriggers({ 'customOpenTrigger': 'customCloseTrigger' });
$tooltipProvider.setTriggers({ customOpenTrigger: 'foo bar' });
$tooltipProvider.options({trigger: 'customOpenTrigger'});
}));

Expand All @@ -844,7 +844,11 @@ describe('$tooltipProvider', function() {
expect(tooltipScope.isOpen).toBeFalsy();
trigger(elm, 'customOpenTrigger');
expect(tooltipScope.isOpen).toBeTruthy();
trigger(elm, 'customCloseTrigger');
trigger(elm, 'foo');
expect(tooltipScope.isOpen).toBeFalsy();
trigger(elm, 'customOpenTrigger');
expect(tooltipScope.isOpen).toBeTruthy();
trigger(elm, 'bar');
expect(tooltipScope.isOpen).toBeFalsy();
}));
});
Expand Down
8 changes: 6 additions & 2 deletions src/tooltip/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,9 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position'])
element.unbind(trigger, showTooltipBind);
});
triggers.hide.forEach(function(trigger) {
element.unbind(trigger, hideTooltipBind);
trigger.split(' ').forEach(function(hideTrigger) {
element[0].removeEventListener(hideTrigger, hideTooltipBind);
});
});
};

Expand All @@ -404,7 +406,9 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position'])
element[0].addEventListener(trigger, toggleTooltipBind);
} else if (trigger) {
element[0].addEventListener(trigger, showTooltipBind);
element[0].addEventListener(triggers.hide[idx], hideTooltipBind);
triggers.hide[idx].split(' ').forEach(function(trigger) {
element[0].addEventListener(trigger, hideTooltipBind);
});
}
});
}
Expand Down