mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-18 15:54:26 +01:00
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
This commit is contained in:
commit
c4d47fb1ea
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…
x
Reference in New Issue
Block a user