diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d6ecc58693..80e5096dfb 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index d9fa91d6c1..0bc6de916b 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -169,9 +169,9 @@ width: 100%; min-height: 28px; /* Make inputs at least the height of their button counterpart */ - + /* Makes inputs behave like true block-level elements */ - + -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; diff --git a/docs/javascript.html b/docs/javascript.html index a90562767e..39cb5c5a5e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -609,7 +609,7 @@ $('#myModal').on('hidden', function () {

Example tabs

Click the tabs below to toggle between hidden panes, even via dropdown menus.

-

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)
+

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>
@@ -653,7 +664,7 @@ $('#myModal').on('hidden', function () {
             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 @@ $('#myModal').on('hidden', function () {
 
 <script>
   $(function () {
-    $('.tabs a:last').tab('show')
+    $('#myTab a:last').tab('show')
   })
 </script>

           
Events

@@ -893,7 +904,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
           
Markup

           

-          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
+          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
           

           
Methods

           
$().popover(options)

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 7fd4c98d02..c6d1f403c4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -533,7 +533,7 @@ $('#myModal').on('hidden', function () {
         

           
{{_i}}Example tabs{{/i}}

           
{{_i}}Click the tabs below to toggle between hidden panes, even via dropdown menus.{{/i}}

-          

           

           
{{_i}}Using bootstrap-tab.js{{/i}}

-          
{{_i}}Enable tabbable tabs via javascript:{{/i}}

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

+          
{{_i}}Enable tabbable tabs via javascript (each tab needs to be activated individually):{{/i}}

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

+          
{{_i}}You can activate individual tabs in several ways:{{/i}}

+
+$('#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)
+

           
{{_i}}Markup{{/i}}

-          
{{_i}}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.{{/i}}

+          
{{_i}}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.{{/i}}

 
 <ul class="nav nav-tabs">
   <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
@@ -577,7 +588,7 @@ $('#myModal').on('hidden', function () {
             {{_i}}Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.{{/i}}
           

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

           
{{_i}}Events{{/i}}

@@ -817,7 +828,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
           
{{_i}}Markup{{/i}}

           

-          {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.{{/i}}
+          {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}
           

           
{{_i}}Methods{{/i}}

           
$().popover({{_i}}options{{/i}})