mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-19 14:00:24 +00:00
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
This commit is contained in:
commit
c4d47fb1ea
4 changed files with 1 additions and 4 deletions
1
docs/assets/js/bootstrap-typeahead.js
vendored
1
docs/assets/js/bootstrap-typeahead.js
vendored
|
|
@ -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())
|
||||
})
|
||||
|
||||
|
|
|
|||
1
docs/assets/js/bootstrap.js
vendored
1
docs/assets/js/bootstrap.js
vendored
|
|
@ -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())
|
||||
})
|
||||
|
||||
|
|
|
|||
2
docs/assets/js/bootstrap.min.js
vendored
2
docs/assets/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
1
js/bootstrap-typeahead.js
vendored
1
js/bootstrap-typeahead.js
vendored
|
|
@ -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())
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue