Skip to content

Commit

Permalink
Merge branch 'master' of github.com:loopj/jquery-tokeninput
Browse files Browse the repository at this point in the history
  • Loading branch information
loopj committed Jun 12, 2011
2 parents 1538300 + 8b44ebd commit b329acd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Binary file added .DS_Store
Binary file not shown.
5 changes: 4 additions & 1 deletion src/jquery.tokeninput.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ var DEFAULT_SETTINGS = {
animateDropdown: true,
onResult: null,
onAdd: null,
onDelete: null
onDelete: null,
idPrefix: "token-input-"
};

// Default classes to use when theming
Expand Down Expand Up @@ -162,13 +163,15 @@ $.TokenList = function (input, url_or_data, settings) {
.css({
outline: "none"
})
.attr("id", settings.idPrefix + input.id)
.focus(function () {
if (settings.tokenLimit === null || settings.tokenLimit !== token_count) {
show_dropdown_hint();
}
})
.blur(function () {
hide_dropdown();
$(this).val("");
})
.bind("keyup keydown blur update", resize_input)
.keydown(function (event) {
Expand Down

0 comments on commit b329acd

Please sign in to comment.