mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

can't extend bounding box thingy

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/js/bootstrap-tooltip.js
Vendored
+2 -1
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())
docs/assets/js/bootstrap.js
Vendored
+2 -1
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())
docs/assets/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/bootstrap-tooltip.js
Vendored
+1 -1
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())