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.

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

Jump to bottom

Including the original event on enter key press and passing it along to final triggers #5758

Closed
wants to merge 2 commits into from
Closed

Including the original event on enter key press and passing it along to final triggers #5758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8f025
Including the original event on enter key press and passing it along …
Jan 30, 2020
586ff5c
Passing the original event via the originalEvent property within a ob…
joepetrakovich Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/js/select2/core.js
View file
Open in desktop
Expand Up @@ -335,7 +335,9 @@ define([

evt.preventDefault();
} else if (key === KEYS.ENTER) {
self.trigger('results:select', {});
self.trigger('results:select', {
originalEvent: evt
});

evt.preventDefault();
} else if ((key === KEYS.SPACE && evt.ctrlKey)) {
Expand Down
7 changes: 5 additions & 2 deletions src/js/select2/results.js
View file
Open in desktop
Expand Up @@ -325,7 +325,7 @@ define([
$highlighted.trigger('mouseup');
});

container.on('results:select', function () {
container.on('results:select', function (evt) {
var $highlighted = self.getHighlightedResults();

if ($highlighted.length === 0) {
Expand All @@ -335,9 +335,12 @@ define([
var data = Utils.GetData($highlighted[0], 'data');

if ($highlighted.attr('aria-selected') == 'true') {
self.trigger('close', {});
self.trigger('close', {
originalEvent: evt.originalEvent
});
} else {
self.trigger('select', {
originalEvent: evt.originalEvent,
data: data
});
}
Expand Down