diff options
| author | fat <[email protected]> | 2013-07-17 21:14:02 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-17 21:14:02 -0700 |
| commit | 102df4ff3334663b20c8730bbb32a673b4259edf (patch) | |
| tree | 83f4b75cff48ad066b6f2b409ddf5e2a083432e1 /docs/assets/js/bootstrap.js | |
| parent | bf38241f0d95811dd6be0977f91e9a30c3da16c4 (diff) | |
| parent | 55fa1acbd6f351d56b873eef6c59f72899cece49 (diff) | |
| download | bootstrap-102df4ff3334663b20c8730bbb32a673b4259edf.tar.xz bootstrap-102df4ff3334663b20c8730bbb32a673b4259edf.zip | |
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index d5ce3c619..f2c5579ca 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1169,6 +1169,7 @@ $tip .detach() .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) @@ -1205,7 +1206,6 @@ $tip .offset(offset) - .addClass(placement) .addClass('in') var actualWidth = $tip[0].offsetWidth |