wikked: static/bootstrap/js/bootstrap-tooltip.js comparison

comparison static/bootstrap/js/bootstrap-tooltip.js @ 88:a5a3d454eac9

Updated Bootstrap.

author	Ludovic Chabant <ludovic@chabant.com>
date	Fri, 05 Apr 2013 08:08:12 -0700
parents	130eccd396d8
children

comparison

equal deleted inserted replaced

-:c0cf67362fb1
+:a5a3d454eac9
 /* ===========================================================
-* bootstrap-tooltip.js v2.2.2
+* bootstrap-tooltip.js v2.3.1
 * http://twitter.github.com/bootstrap/javascript.html#tooltips
 * Inspired by the original jQuery.tipsy by Jason Frame
 * ===========================================================
 * Copyright 2012 Twitter, Inc.
 *
 constructor: Tooltip
 , init: function (type, element, options) {
 var eventIn
 , eventOut
+, triggers
+, trigger
+, i
 this.type = type
 this.$element = $(element)
 this.options = this.getOptions(options)
 this.enabled = true
-if (this.options.trigger == 'click') {
+triggers = this.options.trigger.split(' ')
-this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-} else if (this.options.trigger != 'manual') {
+for (i = triggers.length; i--;) {
-eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
+trigger = triggers[i]
-eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
+if (trigger == 'click') {
-this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+} else if (trigger != 'manual') {
+eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
+eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+}
 }
 this.options.selector ?
 (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
 this.fixTitle()
 }
 , getOptions: function (options) {
-options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
 if (options.delay && typeof options.delay == 'number') {
 options.delay = {
 show: options.delay
 , hide: options.delay
 return options
 }
 , enter: function (e) {
-var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+var defaults = $.fn[this.type].defaults
+, options = {}
+, self
+this._options && $.each(this._options, function (key, value) {
+if (defaults[key] != value) options[key] = value
+}, this)
+self = $(e.currentTarget)[this.type](options).data(this.type)
 if (!self.options.delay || !self.options.delay.show) return self.show()
 clearTimeout(this.timeout)
 self.hoverState = 'in'
 }, self.options.delay.hide)
 }
 , show: function () {
 var $tip
-, inside
 , pos
 , actualWidth
 , actualHeight
 , placement
 , tp
+, e = $.Event('show')
 if (this.hasContent() && this.enabled) {
+this.$element.trigger(e)
+if (e.isDefaultPrevented()) return
 $tip = this.tip()
 this.setContent()
 if (this.options.animation) {
 $tip.addClass('fade')
 placement = typeof this.options.placement == 'function' ?
 this.options.placement.call(this, $tip[0], this.$element[0]) :
 this.options.placement
-inside = /in/.test(placement)
 $tip
 .detach()
 .css({ top: 0, left: 0, display: 'block' })
-.insertAfter(this.$element)
+this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-pos = this.getPosition(inside)
+pos = this.getPosition()
 actualWidth = $tip[0].offsetWidth
 actualHeight = $tip[0].offsetHeight
-switch (inside ? placement.split(' ')[1] : placement) {
+switch (placement) {
 case 'bottom':
 tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
 break
 case 'top':
 tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
 case 'right':
 tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
 break
 }
-$tip
+this.applyPlacement(tp, placement)
-.offset(tp)
+this.$element.trigger('shown')
-.addClass(placement)
+}
-.addClass('in')
+}
-}
+, applyPlacement: function(offset, placement){
+var $tip = this.tip()
+, width = $tip[0].offsetWidth
+, height = $tip[0].offsetHeight
+, actualWidth
+, actualHeight
+, delta
+, replace
+$tip
+.offset(offset)
+.addClass(placement)
+.addClass('in')
+actualWidth = $tip[0].offsetWidth
+actualHeight = $tip[0].offsetHeight
+if (placement == 'top' && actualHeight != height) {
+offset.top = offset.top + height - actualHeight
+replace = true
+}
+if (placement == 'bottom' || placement == 'top') {
+delta = 0
+if (offset.left < 0){
+delta = offset.left * -2
+offset.left = 0
+$tip.offset(offset)
+actualWidth = $tip[0].offsetWidth
+actualHeight = $tip[0].offsetHeight
+}
+this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+} else {
+this.replaceArrow(actualHeight - height, actualHeight, 'top')
+}
+if (replace) $tip.offset(offset)
+}
+, replaceArrow: function(delta, dimension, position){
+this
+.arrow()
+.css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
 }
 , setContent: function () {
 var $tip = this.tip()
 , title = this.getTitle()
 }
 , hide: function () {
 var that = this
 , $tip = this.tip()
+, e = $.Event('hide')
+this.$element.trigger(e)
+if (e.isDefaultPrevented()) return
 $tip.removeClass('in')
 function removeWithAnimation() {
 var timeout = setTimeout(function () {
 $.support.transition && this.$tip.hasClass('fade') ?
 removeWithAnimation() :
 $tip.detach()
+this.$element.trigger('hidden')
 return this
 }
 , fixTitle: function () {
 var $e = this.$element
 , hasContent: function () {
 return this.getTitle()
 }
-, getPosition: function (inside) {
+, getPosition: function () {
-return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
+var el = this.$element[0]
-width: this.$element[0].offsetWidth
+return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-, height: this.$element[0].offsetHeight
+width: el.offsetWidth
-})
+, height: el.offsetHeight
+}, this.$element.offset())
 }
 , getTitle: function () {
 var title
 , $e = this.$element
 return title
 }
 , tip: function () {
 return this.$tip = this.$tip || $(this.options.template)
+}
+, arrow: function(){
+return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
 }
 , validate: function () {
 if (!this.$element[0].parentNode) {
 this.hide()
 , toggleEnabled: function () {
 this.enabled = !this.enabled
 }
 , toggle: function (e) {
-var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
-self[self.tip().hasClass('in') ? 'hide' : 'show']()
+self.tip().hasClass('in') ? self.hide() : self.show()
 }
 , destroy: function () {
 this.hide().$element.off('.' + this.type).removeData(this.type)
 }
 $.fn.tooltip.defaults = {
 animation: true
 , placement: 'top'
 , selector: false
 , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-, trigger: 'hover'
+, trigger: 'hover focus'
 , title: ''
 , delay: 0
 , html: false
+, container: false
 }
 /* TOOLTIP NO CONFLICT
 * =================== */