aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-03-08 11:39:50 -0800
committerJacob Thornton <[email protected]>2012-03-08 11:39:50 -0800
commitaf1dbf6581e20ac67465706499a2732e7faf9c67 (patch)
treedf33205e1d16f2d2887a14065ce03cf1768946cd /docs
parentd3721c504e7838ba3ee867d68536e6cf0b6b7f66 (diff)
downloadbootstrap-af1dbf6581e20ac67465706499a2732e7faf9c67.tar.xz
bootstrap-af1dbf6581e20ac67465706499a2732e7faf9c67.zip
rebuild
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin54977 -> 54993 bytes
-rw-r--r--docs/assets/js/bootstrap-typeahead.js12
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 48e8324e3..a12cdd8d7 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
index 503155950..99f84f796 100644
--- a/docs/assets/js/bootstrap-typeahead.js
+++ b/docs/assets/js/bootstrap-typeahead.js
@@ -40,6 +40,7 @@
, select: function () {
var val = this.$menu.find('.active').attr('data-value')
this.$element.val(val)
+ this.$element.change();
return this.hide()
}
@@ -165,9 +166,6 @@
}
, keyup: function (e) {
- e.stopPropagation()
- e.preventDefault()
-
switch(e.keyCode) {
case 40: // down arrow
case 38: // up arrow
@@ -180,6 +178,7 @@
break
case 27: // escape
+ if (!this.shown) return
this.hide()
break
@@ -187,10 +186,11 @@
this.lookup()
}
+ e.stopPropagation()
+ e.preventDefault()
}
, keypress: function (e) {
- e.stopPropagation()
if (!this.shown) return
switch(e.keyCode) {
@@ -210,12 +210,12 @@
this.next()
break
}
+
+ e.stopPropagation()
}
, blur: function (e) {
var that = this
- e.stopPropagation()
- e.preventDefault()
setTimeout(function () { that.hide() }, 150)
}