From: fat <jacobthornton@gmail.com>
Date: Thu, 26 Dec 2013 04:03:28 +0000 (-0800)
Subject: Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into... 
X-Git-Tag: v3.1.0~136^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c25fa0661aa974019664e21517d2122dccf70095;p=thirdparty%2Fbootstrap.git

Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix

Conflicts:
	js/tooltip.js
---

c25fa0661aa974019664e21517d2122dccf70095
diff --cc js/tooltip.js
index 9d1e8421bf,533f19b315..4c0e4bdcdf
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@@ -177,8 -189,17 +178,17 @@@
        var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
  
        this.applyPlacement(calculatedOffset, placement)
 +      this.hoverState = null
-       this.$element.trigger('shown.bs.' + this.type)
+ 
+       var complete = function() {
+         that.$element.trigger('shown.bs.' + that.type)
+       }
+ 
+       $.support.transition && this.$tip.hasClass('fade') ?
 -      $tip
 -        .one($.support.transition.end, complete)
 -        .emulateTransitionEnd(150) :
 -      complete()
 -
++        $tip
++          .one($.support.transition.end, complete)
++          .emulateTransitionEnd(150) :
++        complete()
      }
    }
  
@@@ -275,9 -288,6 +286,8 @@@
          .emulateTransitionEnd(150) :
        complete()
  
 +    this.hoverState = null
-     this.$element.trigger('hidden.bs.' + this.type)
 +
      return this
    }