Skip to content
Merged
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
5 changes: 4 additions & 1 deletion src/typeahead/typeahead.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,10 @@ var Typeahead = (function() {
var $selectable;

if ($selectable = this.menu.getActiveSelectable()) {
this.select($selectable) && $e.preventDefault();
if (this.select($selectable)) {
$e.preventDefault();
$e.stopPropagation();
}
}
},

Expand Down
5 changes: 3 additions & 2 deletions test/typeahead/typeahead_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ describe('Typeahead', function() {

beforeEach(function() {
eventName = 'enterKeyed';
payload = jasmine.createSpyObj('event', ['preventDefault']);
payload = jasmine.createSpyObj('event', ['preventDefault', 'stopPropagation']);
});

describe('when idle', function() {
Expand Down Expand Up @@ -330,7 +330,7 @@ describe('Typeahead', function() {
expect(this.view.select).toHaveBeenCalledWith($el);
});

it('should prevent default if active selectale ', function() {
it('should prevent default and stop propagation if active selectable ', function() {
var $el;

$el = $('<bah>');
Expand All @@ -340,6 +340,7 @@ describe('Typeahead', function() {
this.input.trigger(eventName, payload);

expect(payload.preventDefault).toHaveBeenCalled();
expect(payload.stopPropagation).toHaveBeenCalled();
});

it('should not select selectable if there is no active one', function() {
Expand Down