root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

can't extend bounding box thingy

This commit is contained in:
fat 2012-12-19 22:03:57 -08:00
parent dc4e80a655
commit 219d275ae6
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/assets/js/bootstrap-tooltip.js vendored
View File

@ -192,7 +192,8 @@
, getPosition: function () { , getPosition: function () {
var el = this.$element[0] var el = this.$element[0]
return $.extend(el.getBoundingClientRect ? el.getBoundingClientRect() : {
return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : {
width: el.offsetWidth width: el.offsetWidth
, height: el.offsetHeight , height: el.offsetHeight
}, this.$element.offset()) }, this.$element.offset())

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

@ -1208,7 +1208,8 @@
, getPosition: function () { , getPosition: function () {
var el = this.$element[0] var el = this.$element[0]
return $.extend(el.getBoundingClientRect ? el.getBoundingClientRect() : {
return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : {
width: el.offsetWidth width: el.offsetWidth
, height: el.offsetHeight , height: el.offsetHeight
}, this.$element.offset()) }, this.$element.offset())

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

File diff suppressed because one or more lines are too long

2
js/bootstrap-tooltip.js vendored
View File

@ -192,7 +192,7 @@
, getPosition: function () { , getPosition: function () {
var el = this.$element[0] var el = this.$element[0]
return $.extend(el.getBoundingClientRect ? el.getBoundingClientRect() : { return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : {
width: el.offsetWidth width: el.offsetWidth
, height: el.offsetHeight , height: el.offsetHeight
}, this.$element.offset()) }, this.$element.offset())