diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-19 12:52:57 +0400 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-19 12:52:57 +0400 |
commit | 61b2e6632af7db5c08311729a4b7062d9ed77760 (patch) | |
tree | 1aceb986013d6207d36d545c2f3d10057939c152 /assets/javascripts/bootstrap | |
parent | 0d539a9aebea3ac9c332346b1233419935943412 (diff) |
rake convert
Diffstat (limited to 'assets/javascripts/bootstrap')
-rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index 614f4145..9932c0b1 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -192,7 +192,7 @@ var parentDim = this.getPosition($parent) placement = placement == 'bottom' && pos.top + pos.height + actualHeight - parentDim.scroll > parentDim.height ? 'top' : - placement == 'top' && pos.top - parentDim.scroll - actualHeight < 0 ? 'bottom' : + placement == 'top' && pos.top - parentDim.scroll - actualHeight < parentDim.top ? 'bottom' : placement == 'right' && pos.right + actualWidth > parentDim.width ? 'left' : placement == 'left' && pos.left - actualWidth < parentDim.left ? 'right' : placement @@ -407,14 +407,6 @@ return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) } - Tooltip.prototype.validate = function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - Tooltip.prototype.enable = function () { this.enabled = true } |