diff options
| author | Mark Otto <[email protected]> | 2014-01-05 23:19:34 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-05 23:19:34 -0800 |
| commit | 3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1 (patch) | |
| tree | 00abaf00528eeb98617071bd7fb0eda600491b06 /js | |
| parent | 12dacee313e49ff421fc81d5e0a6a70111c3a4af (diff) | |
| parent | 422bdc50f9a2bd1f6ec72ebb113af1a485d3465d (diff) | |
| download | bootstrap-3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1.tar.xz bootstrap-3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/components.html
Diffstat (limited to 'js')
| -rw-r--r-- | js/tooltip.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index c472406ff..ce9ee4c5a 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -211,7 +211,7 @@ // $.fn.offset doesn't round pixel values // so we use setOffset directly with our own function B-0 - jQuery.offset.setOffset($tip[0], $.extend({ + $.offset.setOffset($tip[0], $.extend({ using: function (props) { $tip.css({ top: Math.round(props.top), |