diff options
| author | XhmikosR <[email protected]> | 2015-01-16 18:38:52 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2015-01-16 18:38:52 +0200 |
| commit | f6a96e78244304bc3ec564078100e15f2be79a8b (patch) | |
| tree | c9bddfdac283224978c966143e246cc0916bfdbd /js | |
| parent | 2eaa7e0e1c67e2ed38ce69840d6ed0a251a0b976 (diff) | |
| parent | 0481ce973f2c10753e23d2de21aafb78c582a0e5 (diff) | |
| download | bootstrap-f6a96e78244304bc3ec564078100e15f2be79a8b.tar.xz bootstrap-f6a96e78244304bc3ec564078100e15f2be79a8b.zip | |
Merge pull request #15583 from twbs/deps
Update devDependencies.
Diffstat (limited to 'js')
| -rw-r--r-- | js/.jscsrc | 1 | ||||
| -rw-r--r-- | js/tooltip.js | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/js/.jscsrc b/js/.jscsrc index ac1d73f55..982676e15 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -25,6 +25,7 @@ "requireSpaceBetweenArguments": true, "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true }, "requireSpacesInConditionalExpression": true, + "requireSpacesInForStatement": true, "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true }, "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true }, diff --git a/js/tooltip.js b/js/tooltip.js index a1140d247..f9adb81ef 100644 --- a/js/tooltip.js +++ b/js/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 } } |