diff options
| author | fat <[email protected]> | 2013-02-05 20:01:25 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-02-05 20:01:25 -0800 |
| commit | c25e8182baacfea77c15aba1e03e447297a26b84 (patch) | |
| tree | f33889c8f0ae73b246ade333cc773b045e1f3f85 /js | |
| parent | 45656fc7fcedf5a98d20c72292b203a1023c4177 (diff) | |
| parent | 31fdb2e25e3a0e924a7772edcd2fa3f12518e1f4 (diff) | |
| download | bootstrap-c25e8182baacfea77c15aba1e03e447297a26b84.tar.xz bootstrap-c25e8182baacfea77c15aba1e03e447297a26b84.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-tooltip.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index c23d8267a..9ba2d1214 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -212,7 +212,7 @@ , getPosition: function () { var el = this.$element[0] - return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : { + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { width: el.offsetWidth , height: el.offsetHeight }, this.$element.offset()) |