diff options
| author | fat <[email protected]> | 2012-12-19 22:26:36 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2012-12-19 22:26:36 -0800 |
| commit | 96e5fa6143072db64f34482873c6f7d6b3ec4ffd (patch) | |
| tree | 09c45192eebbf31073589a4777791a1159cfc97d /docs/assets/js/bootstrap.js | |
| parent | 7c456c85545b433759913051779bf4af9b000d48 (diff) | |
| download | bootstrap-96e5fa6143072db64f34482873c6f7d6b3ec4ffd.tar.xz bootstrap-96e5fa6143072db64f34482873c6f7d6b3ec4ffd.zip | |
whitespace in tooltip + don't pass empty selector to $() in dropdown.js
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 714d326bc..612664dd9 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -726,8 +726,9 @@ selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 } - $parent = $(selector) - $parent.length || ($parent = $this.parent()) + $parent = selector && $(selector) + + if (!$parent || !$parent.length) $parent = $this.parent() return $parent } @@ -1208,7 +1209,6 @@ , getPosition: function () { var el = this.$element[0] - return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : { width: el.offsetWidth , height: el.offsetHeight |