From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 30 Sep 2011 05:18:08 +0000 (-0700)
Subject: Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab... 
X-Git-Tag: v1.4.0~62^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24b05fe94a46a5b21a122a08b967eeb3ee6e6a86;p=thirdparty%2Fbootstrap.git

Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event
---

24b05fe94a46a5b21a122a08b967eeb3ee6e6a86
diff --cc js/bootstrap-tabs.js
index dece95be66,380ded17c8..563d88f013
--- a/js/bootstrap-tabs.js
+++ b/js/bootstrap-tabs.js
@@@ -28,8 -28,9 +28,9 @@@
    function tab( e ) {
      var $this = $(this)
        , href = $this.attr('href')
 -      , $ul = $(e.liveFired)
 +      , $ul = $this.closest('ul')
        , $controlled
+       , current = $ul.find('.active a').attr('href')
  
      if (/^#\w+/.test(href)) {
        e.preventDefault()
@@@ -59,4 -61,4 +61,4 @@@
      $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
    })
  
- }( window.jQuery || window.ender );
 -})( window.jQuery || window.ender )
++}( window.jQuery || window.ender );