Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

twbs · Feb 8, 2013 · c4d47fb · c4d47fb
2 parents 30fd4be + 501aabf
commit c4d47fb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
@@ -329,7 +329,6 @@
   $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
     var $this = $(this)
     if ($this.data('typeahead')) return
-    e.preventDefault()
     $this.typeahead($this.data())
   })
 

diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
@@ -2145,7 +2145,6 @@
   $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
     var $this = $(this)
     if ($this.data('typeahead')) return
-    e.preventDefault()
     $this.typeahead($this.data())
   })