Skip to content

fix #83 bug with functional keys #90

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

Open
fitiskin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix #83 bug with functional keys #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/jquery.fs.selecter.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

var guid = 0,
userAgent = (window.navigator.userAgent||window.navigator.vendor||window.opera),
ignoredKeyCode = [19, 20, 27, 33, 34, 35, 36, 44, 45, 46, 91, 92, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 144, 145],
isFirefox = /Firefox/i.test(userAgent),
isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(userAgent),
isFirefoxMobile = (isFirefox && isMobile),
Expand Down Expand Up @@ -608,7 +609,7 @@

if (!data.$select.is(":disabled") && !data.multiple) {
data.$selecter.addClass("focus")
.on("keydown.selecter-" + data.guid, data, _onKeypress);
.on("keydown.selecter-" + data.guid, data, _onKeydown);

$(".selecter").not(data.$selecter)
.trigger("close.selecter", [ data ]);
Expand Down Expand Up @@ -636,11 +637,11 @@

/**
* @method private
* @name _onKeypress
* @description Handles instance keypress, once focused
* @name _onKeydown
* @description Handles instance keydown, once focused
* @param e [object] "Event data"
*/
function _onKeypress(e) {
function _onKeydown(e) {
var data = e.data;

if (e.keyCode === 13) {
Expand All @@ -649,7 +650,7 @@
_update(data.index, data);
}
_handleChange(data);
} else if (e.keyCode !== 9 && (!e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey)) {
} else if (e.keyCode !== 9 && (!e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) && $.inArray(e.keyCode, ignoredKeyCode) === -1) {
// Ignore modifiers & tabs
e.preventDefault();
e.stopPropagation();
Expand Down