mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch 'master' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2013-02-07 22:18:53 -08:00
parent a9729c5fd0 8c7f9c66a7
commit 2aa1a4dc70
12 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/bootstrap-typeahead.js
Vendored
-1
View File
@@ -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())
})