diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-08-19 20:33:04 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-08-19 20:33:04 +0400 |
| commit | 67763549c1d3a63582fdcd5e4963ecd02228ad5d (patch) | |
| tree | 87f18dff7eead6be4be043091f0addb4b7d2a0c0 /assets/javascripts | |
| parent | 9ece2c8cf002ef846a64f8378e3da462eef5e7d4 (diff) | |
rake convert
Diffstat (limited to 'assets/javascripts')
| -rw-r--r-- | assets/javascripts/bootstrap.js | 6 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap/alert.js | 2 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap/popover.js | 2 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index bd929c7..87c63d7 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -199,7 +199,7 @@ if (e) e.preventDefault() if (!$parent.length) { - $parent = $this.hasClass('alert') ? $this : $this.parent() + $parent = $this.closest('.alert') } $parent.trigger(e = $.Event('close.bs.alert')) @@ -1907,7 +1907,7 @@ var isBody = el.tagName == 'BODY' var isSvg = window.SVGElement && el instanceof window.SVGElement - var elRect = el.getBoundingClientRect ? el.getBoundingClientRect() : null + var elRect = el.getBoundingClientRect() var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var outerDims = isSvg ? {} : { @@ -2097,7 +2097,7 @@ var content = this.getContent() $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events + $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' ](content) diff --git a/assets/javascripts/bootstrap/alert.js b/assets/javascripts/bootstrap/alert.js index 5389c32..1048389 100644 --- a/assets/javascripts/bootstrap/alert.js +++ b/assets/javascripts/bootstrap/alert.js @@ -36,7 +36,7 @@ if (e) e.preventDefault() if (!$parent.length) { - $parent = $this.hasClass('alert') ? $this : $this.parent() + $parent = $this.closest('.alert') } $parent.trigger(e = $.Event('close.bs.alert')) diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js index 825e1b3..87b8d12 100644 --- a/assets/javascripts/bootstrap/popover.js +++ b/assets/javascripts/bootstrap/popover.js @@ -46,7 +46,7 @@ var content = this.getContent() $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events + $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' ](content) diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index 0758b07..e730db6 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -323,7 +323,7 @@ var isBody = el.tagName == 'BODY' var isSvg = window.SVGElement && el instanceof window.SVGElement - var elRect = el.getBoundingClientRect ? el.getBoundingClientRect() : null + var elRect = el.getBoundingClientRect() var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var outerDims = isSvg ? {} : { |