can't extend bounding box thingy

219d275a · fat · dc4e80a6 · 219d275a · 219d275a · 219d275a
Commit 219d275a authored 12 years ago by fat
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 4 deletions
+6 -4
--- a/docs/assets/js/bootstrap-tooltip.js
+++ b/docs/assets/js/bootstrap-tooltip.js
@@ -192,7 +192,8 @@
  , getPosition: function () {
      var el = this.$element[0]
-      return $.extend(el.getBoundingClientRect ? el.getBoundingClientRect() : {
+      return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : {
        width: el.offsetWidth
      , height: el.offsetHeight
      }, this.$element.offset())

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

--- a/docs/assets/js/bootstrap.min.js
+++ b/docs/assets/js/bootstrap.min.js
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -192,7 +192,7 @@
  , getPosition: function () {
      var el = this.$element[0]
-      return $.extend(el.getBoundingClientRect ? el.getBoundingClientRect() : {
+      return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : {
        width: el.offsetWidth
      , height: el.offsetHeight
      }, this.$element.offset())