diff options
author | Thomas Park <thomas@thomaspark.me> | 2015-03-17 14:23:20 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2015-03-17 14:23:20 -0400 |
commit | 66e5c761eea0ce48fcf72844f043db4bcb43c6d9 (patch) | |
tree | e394156c0683a60f4cf7d8213fb0bbbf32001ae4 /bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js | |
parent | 93738d763fd08637ccfd3ab322176b70f099d309 (diff) |
update bootstrap 3.3.4
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js')
-rw-r--r-- | bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js index 1856df59..27367880 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.3.2 + * Bootstrap: tooltip.js v3.3.4 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -15,17 +15,17 @@ // =============================== var Tooltip = function (element, options) { - this.type = - this.options = - this.enabled = - this.timeout = - this.hoverState = + this.type = null + this.options = null + this.enabled = null + this.timeout = null + this.hoverState = null this.$element = null this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.2' + Tooltip.VERSION = '3.3.4' Tooltip.TRANSITION_DURATION = 150 @@ -52,6 +52,10 @@ this.options = this.getOptions(options) this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport) + if (this.$element[0] instanceof document.constructor && !this.options.selector) { + throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!') + } + var triggers = this.options.trigger.split(' ') for (var i = triggers.length; i--;) { @@ -272,10 +276,10 @@ this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) } - Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) { + Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { this.arrow() - .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') - .css(isHorizontal ? 'top' : 'left', '') + .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') + .css(isVertical ? 'top' : 'left', '') } Tooltip.prototype.setContent = function () { @@ -288,7 +292,7 @@ Tooltip.prototype.hide = function (callback) { var that = this - var $tip = this.tip() + var $tip = $(this.$tip) var e = $.Event('hide.bs.' + this.type) function complete() { @@ -305,7 +309,7 @@ $tip.removeClass('in') - $.support.transition && this.$tip.hasClass('fade') ? + $.support.transition && $tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : @@ -449,7 +453,7 @@ var data = $this.data('bs.tooltip') var options = typeof option == 'object' && option - if (!data && option == 'destroy') return + if (!data && /destroy|hide/.test(option)) return if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) |