From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Thu, 22 Mar 2012 20:24:57 +0000 (+0100)
Subject: Clarify docs on how tabs are activated from JS, see #1000
X-Git-Tag: v2.0.3~5^2~144^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2722%2Fhead;p=thirdparty%2Fbootstrap.git

Clarify docs on how tabs are activated from JS, see #1000
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 716a5d5099..80e5096dfb 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index f2d23ef52a..39cb5c5a5e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -636,9 +636,13 @@ $('#myModal').on('hidden', function () {
           </div>
           <hr>
           <h2>Using bootstrap-tab.js</h2>
-          <p>Enable tabbable tabs via javascript:</p>
-          <pre class="prettyprint linenums">$('#myTab').tab('show')</pre>
-          <p>You can select individual tabs in several ways:</p>
+          <p>Enable tabbable tabs via javascript (each tab needs to be activated individually):</p>
+          <pre class="prettyprint linenums">
+$('#myTab a').click(function (e) {
+  e.preventDefault();
+  $(this).tab('show');
+})</pre>
+          <p>You can activate individual tabs in several ways:</p>
 <pre class="prettyprint linenums">
 $('#myTab a[href="#profile"]').tab('show'); //Select tab by name
 $('#myTab a:first').tab('show'); //Select first tab
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 925377339b..c6d1f403c4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -560,9 +560,13 @@ $('#myModal').on('hidden', function () {
           </div>
           <hr>
           <h2>{{_i}}Using bootstrap-tab.js{{/i}}</h2>
-          <p>{{_i}}Enable tabbable tabs via javascript:{{/i}}</p>
-          <pre class="prettyprint linenums">$('#myTab').tab('show')</pre>
-          <p>{{_i}}You can select individual tabs in several ways:{{/i}}</p>
+          <p>{{_i}}Enable tabbable tabs via javascript (each tab needs to be activated individually):{{/i}}</p>
+          <pre class="prettyprint linenums">
+$('#myTab a').click(function (e) {
+  e.preventDefault();
+  $(this).tab('show');
+})</pre>
+          <p>{{_i}}You can activate individual tabs in several ways:{{/i}}</p>
 <pre class="prettyprint linenums">
 $('#myTab a[href="#profile"]').tab('show'); //Select tab by name
 $('#myTab a:first').tab('show'); //Select first tab