diff options
| author | Mark Otto <[email protected]> | 2013-12-07 11:41:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-07 11:41:02 -0800 |
| commit | cc1f95652bbf5c7d7ab5b040cdc15478d68e0369 (patch) | |
| tree | 2b0c31076784e3d74e4e9d05b62916a696e1b959 /dist/js | |
| parent | 775c29fef6d87dd91ebc6dba5980f3b59976b435 (diff) | |
| parent | 94a5413ec7fb90c1340f1243869274c36d308cb0 (diff) | |
| download | bootstrap-cc1f95652bbf5c7d7ab5b040cdc15478d68e0369.tar.xz bootstrap-cc1f95652bbf5c7d7ab5b040cdc15478d68e0369.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'dist/js')
| -rw-r--r-- | dist/js/bootstrap.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 850e6e53b..183279907 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1272,7 +1272,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } } - Tooltip.prototype.applyPlacement = function(offset, placement) { + Tooltip.prototype.applyPlacement = function (offset, placement) { var replace var $tip = this.tip() var width = $tip[0].offsetWidth @@ -1323,7 +1323,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (replace) $tip.offset(offset) } - Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') } |