Skip to content

Commit

Permalink
v1.5.3
Browse files Browse the repository at this point in the history
Fix issue related to data-hidden and opening the menu when typing a
letter
  • Loading branch information
caseyjhol committed Mar 9, 2014
1 parent ad009c8 commit 2e659cf
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion bootstrap-select.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* bootstrap-select v1.5.2
* bootstrap-select v1.5.3
* http:https://silviomoreto.github.io/bootstrap-select/
*
* Copyright 2013 bootstrap-select
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-select.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"select",
"replacement"
],
"version": "1.5.2",
"version": "1.5.3",
"author": {
"name": "Silvio Moreto",
"url": "https://github.com/silviomoreto/"
Expand Down
14 changes: 10 additions & 4 deletions bootstrap-select.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* bootstrap-select v1.5.2
* bootstrap-select v1.5.3
* http:https://silviomoreto.github.io/bootstrap-select/
*
* Copyright 2013 bootstrap-select
Expand Down Expand Up @@ -457,12 +457,12 @@
},

setSelected: function(index, selected) {
if (this.$lis == null) this.$lis = this.$menu.find('li:not(.hide)');
if (this.$lis == null) this.$lis = this.$menu.find('li');
$(this.$lis[index]).toggleClass('selected', selected);
},

setDisabled: function(index, disabled) {
if (this.$lis == null) this.$lis = this.$menu.find('li:not(.hide)');
if (this.$lis == null) this.$lis = this.$menu.find('li');
if (disabled) {
$(this.$lis[index]).addClass('disabled').find('a').attr('href', '#').attr('tabindex', -1);
} else {
Expand Down Expand Up @@ -757,7 +757,13 @@
isActive = that.$menu.parent().hasClass('open');

if (!isActive && /([0-9]|[A-z])/.test(String.fromCharCode(e.keyCode))) {
that.$newElement.trigger('click');
if (!that.options.container) {
that.setSize();
that.$menu.parent().addClass('open');
isActive = that.$menu.parent().hasClass('open');
} else {
that.$newElement.trigger('click');
}
that.$searchbox.focus();
}

Expand Down
2 changes: 1 addition & 1 deletion bootstrap-select.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bootstrap-select.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"bootstrap-select.css",
"bootstrap-select.js"
],
"version": "1.5.2",
"version": "1.5.3",
"homepage": "https://github.com/silviomoreto/bootstrap-select",
"authors": [
"silviomoreto"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A custom <select> for Bootstrap using button dropdown as replacement",
"keywords": ["form", "bootstrap", "select", "replacement"],
"homepage": "https://github.com/silviomoreto/bootstrap-select",
"version": "1.5.2",
"version": "1.5.3",
"authors": [
{
"name": "Silvio Moreto",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "bootstrap-select",
"filename": "bootstrap-select.js",
"description": "A custom <select> for Bootstrap using button dropdown as replacement",
"version": "1.5.2",
"version": "1.5.3",
"homepage": "http:https://silviomoreto.github.io/bootstrap-select/",
"author": {
"name": "Silvio Moreto",
Expand Down

0 comments on commit 2e659cf

Please sign in to comment.