Merge pull request #520 from caseyjhol/master

v1.5.4 - fix #510, fix #513
snapappointments · Mar 14, 2014 · 7f58cbb · 7f58cbb
2 parents 5b34f6f + 07d46a4
commit 7f58cbb
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/bootstrap-select.css b/bootstrap-select.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-select v1.5.3
+ * bootstrap-select v1.5.4
  * https://silviomoreto.github.io/bootstrap-select/
  *
  * Copyright 2013 bootstrap-select

diff --git a/bootstrap-select.jquery.json b/bootstrap-select.jquery.json
@@ -8,7 +8,7 @@
  "select",
  "replacement"
  ],
- "version": "1.5.3",
+ "version": "1.5.4",
  "author": {
  "name": "Silvio Moreto",
  "url": "https://github.com/silviomoreto/"

diff --git a/bootstrap-select.js b/bootstrap-select.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-select v1.5.3
+ * bootstrap-select v1.5.4
  * https://silviomoreto.github.io/bootstrap-select/
  *
  * Copyright 2013 bootstrap-select
@@ -191,7 +191,7 @@
  });
 
  $.each(_liA, function(i, item) {
- var hide = item === '<a></a>' ? 'class="hide"' : '';
+ var hide = item === '<a></a>' ? 'class="hide is-hidden"' : '';
  _liHtml += '<li rel="' + i + '"' + hide + '>' + item + '</li>';
  });
 
@@ -653,7 +653,7 @@
  that.$menu.find('.active').removeClass('active');
  if (!!that.$searchbox.val()) {
  that.$searchbox.val('');
- that.$menu.find('li').show();
+ that.$lis.not('.is-hidden').removeClass('hide');
  if (!!no_results.parent().length) no_results.remove();
  }
  if (!that.multiple) that.$menu.find('.selected').addClass('active');
@@ -664,7 +664,7 @@
 
  this.$searchbox.on('input propertychange', function() {
  if (that.$searchbox.val()) {
- that.$lis.removeClass('hide').find('a').not(':icontains(' + that.$searchbox.val() + ')').parent().addClass('hide');
+ that.$lis.not('.is-hidden').removeClass('hide').find('a').not(':icontains(' + that.$searchbox.val() + ')').parent().addClass('hide');
 
  if (!that.$menu.find('li').filter(':visible:not(.no-results)').length) {
  if (!!no_results.parent().length) no_results.remove();
@@ -675,7 +675,7 @@
  }
 
  } else {
- that.$menu.find('li').removeClass('hide');
+ that.$lis.not('.is-hidden').removeClass('hide');
  if (!!no_results.parent().length) no_results.remove();
  }
 

diff --git a/bootstrap-select.min.css b/bootstrap-select.min.css
diff --git a/bootstrap-select.min.js b/bootstrap-select.min.js
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
  "bootstrap-select.css",
  "bootstrap-select.js"
  ],
- "version": "1.5.3",
+ "version": "1.5.4",
  "homepage": "https://github.com/silviomoreto/bootstrap-select",
  "authors": [
  "silviomoreto"

diff --git a/composer.json b/composer.json
@@ -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.3",
+ "version": "1.5.4",
  "authors": [
  {
  "name": "Silvio Moreto",

diff --git a/package.json b/package.json
@@ -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.3",
+ "version": "1.5.4",
  "homepage": "https://silviomoreto.github.io/bootstrap-select/",
  "author": {
  "name": "Silvio Moreto",