focus on escape in typeahead

fat · fat · commit 437654030aa2 · 2012-12-07T18:37:32.000-05:00
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
@@ -53,9 +53,10 @@
 
       if (!isActive) {
         $parent.toggleClass('open')
-        $this.focus()
       }
 
+      $this.focus()
+
       return false
     }
 
diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
@@ -217,7 +217,7 @@
     }
 
   , keydown: function (e) {
-      this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
       this.move(e)
     }
 
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
@@ -664,9 +664,10 @@
 
       if (!isActive) {
         $parent.toggleClass('open')
-        $this.focus()
       }
 
+      $this.focus()
+
       return false
     }
 
@@ -1935,7 +1936,7 @@
     }
 
   , keydown: function (e) {
-      this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
       this.move(e)
     }
 
diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
@@ -53,9 +53,10 @@
 
       if (!isActive) {
         $parent.toggleClass('open')
-        $this.focus()
       }
 
+      $this.focus()
+
       return false
     }
 

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`, keydown: function (e) {`
`220`		`- this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])`
	`220`	`+ this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])`
`221`	`221`	`this.move(e)`
`222`	`222`	`}`
`223`	`223`
Original file line number	Diff line number	Diff line change
`@@ -664,9 +664,10 @@`
`664`	`664`
`665`	`665`	`if (!isActive) {`
`666`	`666`	`$parent.toggleClass('open')`
`667`		`- $this.focus()`
`668`	`667`	`}`
`669`	`668`
	`669`	`+ $this.focus()`
	`670`	`+`
`670`	`671`	`return false`
`671`	`672`	`}`
`672`	`673`
`@@ -1935,7 +1936,7 @@`
`1935`	`1936`	`}`
`1936`	`1937`
`1937`	`1938`	`, keydown: function (e) {`
`1938`		`- this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])`
	`1939`	`+ this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])`
`1939`	`1940`	`this.move(e)`
`1940`	`1941`	`}`
`1941`	`1942`