diff options
| author | Gleb Mazovetskiy <glebm@google.com> | 2015-01-17 19:38:22 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glebm@google.com> | 2015-01-18 01:49:15 +0300 |
| commit | 90446df74e67ca1b4f7eed579eb8b87ccaf90408 (patch) | |
| tree | 0ffadb17af26f3185ce3a43d47046dccaa26d8ec /assets/javascripts | |
| parent | 443d5b49eac84aec1cb2f8ea173554327bfc8c14 (diff) | |
rake convert
Diffstat (limited to 'assets/javascripts')
| -rw-r--r-- | assets/javascripts/bootstrap-sprockets.js | 4 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap.js | 6 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/assets/javascripts/bootstrap-sprockets.js b/assets/javascripts/bootstrap-sprockets.js index 37468b3..1abde49 100644 --- a/assets/javascripts/bootstrap-sprockets.js +++ b/assets/javascripts/bootstrap-sprockets.js @@ -4,9 +4,9 @@ //= require ./bootstrap/carousel //= require ./bootstrap/collapse //= require ./bootstrap/dropdown -//= require ./bootstrap/modal -//= require ./bootstrap/scrollspy //= require ./bootstrap/tab //= require ./bootstrap/transition +//= require ./bootstrap/scrollspy +//= require ./bootstrap/modal //= require ./bootstrap/tooltip //= require ./bootstrap/popover diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index ab0ae1e..705412c 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -1573,10 +1573,10 @@ if (typeof jQuery === 'undefined') { } Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } } diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index a1140d2..f9adb81 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -346,10 +346,10 @@ } Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } } |