mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 05:03:16 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto
2013-05-22 21:51:54 -07:00
parent cdcc3e8768 e7b4fedee8
commit 9868d9403c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/bootstrap.js vendored
View File

@@ -1088,7 +1088,7 @@
this._options && $.each(this._options, function (key, value) { this._options && $.each(this._options, function (key, value) {
if (defaults[key] != value) options[key] = value if (defaults[key] != value) options[key] = value
}, this) })
var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type) var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type)

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
js/tooltip.js
View File

@@ -97,7 +97,7 @@
this._options && $.each(this._options, function (key, value) { this._options && $.each(this._options, function (key, value) {
if (defaults[key] != value) options[key] = value if (defaults[key] != value) options[key] = value
}, this) })
var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type) var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type)