Skip to content

B
bootstrap
Commit 9868d940 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parents cdcc3e87 e7b4fede
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
docs/assets/js/bootstrap.js
View file @ 9868d940
...@@ -1088,7 +1088,7 @@ ...@@ -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)
......
docs/assets/js/bootstrap.min.js
View file @ 9868d940
This diff is collapsed.
js/tooltip.js
View file @ 9868d940
...@@ -97,7 +97,7 @@ ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment