vendor/assets/javascripts/tooltip.js in active_frontend-2.0.10 vs vendor/assets/javascripts/tooltip.js in active_frontend-2.0.11

- old
+ new

@@ -3,21 +3,21 @@ // TOOLTIP PUBLIC CLASS DEFINITION // =============================== var Tooltip = function (element, options) { - this.type = null - this.options = null - this.enabled = null - this.timeout = null - this.hoverState = null + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = this.$element = null this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.4' + Tooltip.VERSION = '3.3.2' Tooltip.TRANSITION_DURATION = 150 Tooltip.DEFAULTS = { animation: true, @@ -40,14 +40,10 @@ this.type = type this.$element = $(element) 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--;) { var trigger = triggers[i] @@ -264,14 +260,14 @@ $tip.offset(offset) this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) } - Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { + Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) { this.arrow() - .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') - .css(isVertical ? 'top' : 'left', '') + .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') + .css(isHorizontal ? 'top' : 'left', '') } Tooltip.prototype.setContent = function () { var $tip = this.tip() var title = this.getTitle() @@ -280,11 +276,11 @@ $tip.removeClass('fade in top bottom left right') } 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() { if (that.hoverState != 'in') $tip.detach() that.$element @@ -297,11 +293,11 @@ if (e.isDefaultPrevented()) return $tip.removeClass('in') - $.support.transition && $tip.hasClass('fade') ? + $.support.transition && this.$tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : complete() @@ -441,10 +437,10 @@ return this.each(function () { var $this = $(this) var data = $this.data('bs.tooltip') var options = typeof option == 'object' && option - if (!data && /destroy|hide/.test(option)) return + if (!data && option == 'destroy') return if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) } \ No newline at end of file