diff options
| author | Mark Otto <[email protected]> | 2013-02-07 22:18:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-07 22:18:53 -0800 |
| commit | 2aa1a4dc706606e060525907574bb648b773f312 (patch) | |
| tree | baccd787bdbcf45a235c3a042c1510730a24b420 /js/bootstrap-typeahead.js | |
| parent | a9729c5fd003abbfa0d1ab5bc318a069fd5b1382 (diff) | |
| parent | 8c7f9c66a7d12f47f50618ef420868fe836d0c33 (diff) | |
| download | bootstrap-2aa1a4dc706606e060525907574bb648b773f312.tar.xz bootstrap-2aa1a4dc706606e060525907574bb648b773f312.zip | |
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'js/bootstrap-typeahead.js')
| -rw-r--r-- | js/bootstrap-typeahead.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 8624bc7bc..a6bb0a09c 100644 --- a/js/bootstrap-typeahead.js +++ b/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()) }) |