mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-21 15:00:23 +00:00
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
commit
9868d9403c
3 changed files with 3 additions and 3 deletions
2
docs/assets/js/bootstrap.js
vendored
2
docs/assets/js/bootstrap.js
vendored
|
|
@ -1088,7 +1088,7 @@
|
|||
|
||||
this._options && $.each(this._options, function (key, value) {
|
||||
if (defaults[key] != value) options[key] = value
|
||||
}, this)
|
||||
})
|
||||
|
||||
var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type)
|
||||
|
||||
|
|
|
|||
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
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
this._options && $.each(this._options, function (key, value) {
|
||||
if (defaults[key] != value) options[key] = value
|
||||
}, this)
|
||||
})
|
||||
|
||||
var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue