Merge pull request #428 from caseyjhol/master

v1.4.2 - modal/data-container bug fix
snapappointments · Dec 18, 2013 · 9656fcf · 9656fcf
2 parents f59bf82 + 9ee32a8
commit 9656fcf
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/bootstrap-select.css b/bootstrap-select.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-select v1.4.1
+ * bootstrap-select v1.4.2
  * http://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.4.1",
+    "version": "1.4.2",
     "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.4.1
+ * bootstrap-select v1.4.2
  * http://silviomoreto.github.io/bootstrap-select/
  *
  * Copyright 2013 bootstrap-select
@@ -730,7 +730,9 @@
 
             } else if (!$this.is('input')) {
 
-                var keyIndex = [];
+                var keyIndex = [],
+                    count,
+                    prevKey;
 
                 $items.each(function() {
                     if ($(this).parent().is(':not(.disabled)')) {
@@ -740,17 +742,18 @@
                     }
                 });
 
-                var count = $(document).data('keycount');
+                count = $(document).data('keycount');
                 count++;
                 $(document).data('keycount',count);
 
-                var prevKey = $.trim($(':focus').text().toLowerCase()).substring(0,1);
+                prevKey = $.trim($(':focus').text().toLowerCase()).substring(0,1);
 
                 if (prevKey != keyCodeMap[e.keyCode]) {
                     count = 1;
-                    $(document).data('keycount',count);
+                    $(document).data('keycount', count);
                 } else if (count >= keyIndex.length) {
-                    $(document).data('keycount',0);
+                    $(document).data('keycount', 0);
+                    if (count > keyIndex.length) count = 1;
                 }
 
                 $items.eq(keyIndex[count - 1]).focus();
@@ -851,6 +854,7 @@
 
     $(document)
         .data('keycount', 0)
-        .on('keydown', '.bootstrap-select [data-toggle=dropdown], .bootstrap-select [role=menu], .bootstrap-select-searchbox input', Selectpicker.prototype.keydown);
+        .on('keydown', '.bootstrap-select [data-toggle=dropdown], .bootstrap-select [role=menu], .bootstrap-select-searchbox input', Selectpicker.prototype.keydown)
+        .on('focusin.modal', '.bootstrap-select [data-toggle=dropdown], .bootstrap-select [role=menu], .bootstrap-select-searchbox input', function (e) { e.stopPropagation(); });
 
 }(window.jQuery);
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.4.1",
+  "version": "1.4.2",
   "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 @twitter bootstrap using button dropdown as replacement",
     "keywords": ["form", "bootstrap", "select", "replacement"],
     "homepage": "https://github.com/silviomoreto/bootstrap-select",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "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 @twitter bootstrap using button dropdown as replacement",
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"homepage": "http://silviomoreto.github.io/bootstrap-select/",
 	"author": {
 		"name": "Silvio Moreto",