diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
| commit | 4c64c1eecdb52d943a50d2c181aeb915a3caed34 (patch) | |
| tree | 93b556ef583bb6a327cad76804bbdf4c5a4c6f4c /js/tooltip.js | |
| parent | 2b56ff04614c4617355d16c14784654e841bcf4d (diff) | |
| parent | d79431ca02683c9d1c754201260f66e5dda15614 (diff) | |
| download | bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.tar.xz bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.zip | |
Merge branch 'master' into pr/11302
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 41375c6c9..7b10d43a2 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.0.0 + * Bootstrap: tooltip.js v3.0.3 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -19,7 +19,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // TOOLTIP PUBLIC CLASS DEFINITION // =============================== @@ -133,7 +133,7 @@ } Tooltip.prototype.show = function () { - var e = $.Event('show.bs.'+ this.type) + var e = $.Event('show.bs.' + this.type) if (this.hasContent() && this.enabled) { this.$element.trigger(e) @@ -192,7 +192,7 @@ } } - Tooltip.prototype.applyPlacement = function(offset, placement) { + Tooltip.prototype.applyPlacement = function (offset, placement) { var replace var $tip = this.tip() var width = $tip[0].offsetWidth @@ -243,8 +243,8 @@ if (replace) $tip.offset(offset) } - Tooltip.prototype.replaceArrow = function(delta, dimension, position) { - this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') } Tooltip.prototype.setContent = function () { @@ -383,4 +383,4 @@ return this } -}(window.jQuery); +}(jQuery); |