diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:29:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:29:47 -0800 |
| commit | 323a40cc53dabf0561c588c8f8ccd690c5bb0a03 (patch) | |
| tree | 0f4ab3c35f65a6f88a8b4a8a28001650cdf4ae7a /js/tooltip.js | |
| parent | 89e0f1669f2b4166051affa4eec819475660ed72 (diff) | |
| parent | 83c60ef3eec234b3dac94c841fd1f13f94aab36f (diff) | |
| download | bootstrap-323a40cc53dabf0561c588c8f8ccd690c5bb0a03.tar.xz bootstrap-323a40cc53dabf0561c588c8f8ccd690c5bb0a03.zip | |
Merge branch 'master' into pr/11162
Conflicts:
less/modals.less
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 89802287a..7b10d43a2 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,9 +1,9 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#tooltip + * Bootstrap: tooltip.js v3.0.3 + * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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); |