From: Mark Otto Date: Fri, 23 Mar 2012 00:10:16 +0000 (-0700) Subject: Merge branch 'Synchro-master' into 2.0.3-wip X-Git-Tag: v2.0.3~5^2~144 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa1b3bdda479e4c419826e2e56fcddb90d6c3519;p=thirdparty%2Fbootstrap.git Merge branch 'Synchro-master' into 2.0.3-wip Conflicts: docs/assets/bootstrap.zip --- fa1b3bdda479e4c419826e2e56fcddb90d6c3519 diff --cc docs/assets/bootstrap.zip index 49ccf75ec0,80e5096dfb..693969290b Binary files differ diff --cc docs/javascript.html index a90562767e,39cb5c5a5e..f0382bf49d --- a/docs/javascript.html +++ b/docs/javascript.html @@@ -636,10 -636,21 +636,21 @@@ $('#myModal').on('hidden', function ()

Using bootstrap-tab.js

-

Enable tabbable tabs via javascript:

- 
$('#myTab').tab('show')
+

Enable tabbable tabs via javascript (each tab needs to be activated individually):

+ 
+ $('#myTab a').click(function (e) {
+   e.preventDefault();
+   $(this).tab('show');
+ })
+

You can activate individual tabs in several ways:

+ 
 -$('#myTab a[href="#profile"]').tab('show'); //Select tab by name
 -$('#myTab a:first').tab('show'); //Select first tab
 -$('#myTab a:last').tab('show'); //Select last tab
 -$('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
++$('#myTab a[href="#profile"]').tab('show'); // Select tab by name
++$('#myTab a:first').tab('show'); // Select first tab
++$('#myTab a:last').tab('show'); // Select last tab
++$('#myTab li:eq(2) a').tab('show'); // Select third tab (0-indexed)
+

Markup

-

You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

+

You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.

  <ul class="nav nav-tabs">
    <li><a href="#home" data-toggle="tab">Home</a></li>
@@@ -650,10 -661,10 +661,10 @@@
            
Methods

            
$().tab

            

--            Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
++            Activates a tab element and content container. Tab should have either a data-target or an href targeting a container node in the DOM.
            

  
- <ul class="nav nav-tabs">
+ <ul class="nav nav-tabs" id="myTab">
    <li class="active"><a href="#home">Home</a></li>
    <li><a href="#profile">Profile</a></li>
    <li><a href="#messages">Messages</a></li>
@@@ -669,7 -680,7 +680,7 @@@
  
  <script>
    $(function () {
-     $('.tabs a:last').tab('show')
 -    $('#myTab a:last').tab('show')
++    $('#myTab a:last').tab('show');
    })
  </script>

            
Events