From 67f199678c6f764f2812260f42b553b22ec740f8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 15:48:57 -0700 Subject: if interval is false, do not autocycle the carousel --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index a90562767..54177b566 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1308,7 +1308,7 @@ $('#myCollapsible').on('hidden', function () { interval number 5000 - The amount of time to delay between automatically cycling an item. + The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle. pause -- cgit v1.2.3 From 07d23b927ee4eefdee51d4fcbffb3dece33be698 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 20:29:22 -0700 Subject: add activate to scrollspy docs --- docs/javascript.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 54177b566..3ee6f795c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -589,6 +589,21 @@ $('#myModal').on('hidden', function () { +

Events

+ + + + + + + + + + + + + +
EventDescription
activateThis event fires whenever a new item becomes activated by the scrollspy.
-- cgit v1.2.3 From a0203bc8e0aa79b8f8cfd8c082c4256bed29ae5b Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Wed, 21 Mar 2012 11:20:56 +0100 Subject: Fix and improve docs on tab config --- docs/javascript.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index a90562767..739e2475f 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -638,6 +638,11 @@ $('#myModal').on('hidden', function () {

Using bootstrap-tab.js

Enable tabbable tabs via javascript:

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

You can also activate a specific tab (or a pseudo-selected one) on init:

+
+$('#myTab a[href="#profile"]').tab('show');
+$('#myTab a:last').tab('show');
+

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.

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

           
Events

-- 
cgit v1.2.3


From 02a67ea59eb8ee28ba4220898c1a0b2052a80915 Mon Sep 17 00:00:00 2001
From: Marcus Bointon 
Date: Wed, 21 Mar 2012 11:28:23 +0100
Subject: Add note about styling tabs Fix typo in popover docs

---
 docs/javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 739e2475f..c9b94a3ca 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -644,7 +644,7 @@ $('#myTab a[href="#profile"]').tab('show');
 $('#myTab a:last').tab('show');

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>
@@ -898,7 +898,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)

-- 
cgit v1.2.3


From cfce34e3000b2c02549e3af280668afea61fa752 Mon Sep 17 00:00:00 2001
From: Marcus Bointon 
Date: Thu, 22 Mar 2012 20:36:49 +0100
Subject: Add more examples for activating tabs Make naming of tab id
 consistent

---
 docs/javascript.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index c9b94a3ca..f2d23ef52 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')

-          
You can select individual tabs in several ways:

+          
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
-- 
cgit v1.2.3


From e84161076b6c54be4ab0950f5d91c23456a967a7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 23 Mar 2012 00:58:41 -0700
Subject: add mention of transitions plugin requirement on collapse

---
 docs/javascript.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index f0382bf49..4f6059cb7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1112,7 +1112,8 @@ $('#my-alert').bind('closed', function () {
           
About

           
Get base styles and flexible support for collapsible components like accordions and navigation.

           Download file
-        
+          
* Requires the Transitions plugin to be included.

+       
         

           
Example accordion

           
Using the collapse plugin, we built a simple accordion style widget:

-- 
cgit v1.2.3


From 6dc59a9c3e0facab3abed7cb66d90c2316530014 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sat, 24 Mar 2012 18:45:12 -0700
Subject: add explict note that tooltip delay isn't applied to manual trigger
 type in popover/tooltip

---
 docs/javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 8728eb66d..631b7e2ec 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -797,7 +797,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                number | object
                0
                
-                
delay showing and hiding the tooltip (ms)

+                
delay showing and hiding the tooltip (ms) - does not apply to manual trigger type

                 
If a number is supplied, delay is applied to both hide/show

                 
Object structure is: delay: { show: 500, hide: 100 }

                
@@ -906,7 +906,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                number | object
                0
                
-                
delay showing and hiding the popover (ms)

+                
delay showing and hiding the popover (ms) - does not apply to manual trigger type

                 
If a number is supplied, delay is applied to both hide/show

                 
Object structure is: delay: { show: 500, hide: 100 }

                
-- 
cgit v1.2.3


From d1864b3608d215ee22daf96268f878b1818c6de1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 25 Mar 2012 00:46:03 -0700
Subject: adding 144x144 ipad touch icon

---
 docs/javascript.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 631b7e2ec..4904eba16 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -20,6 +20,7 @@
 
     
     
+    
     
     
     
-- 
cgit v1.2.3


From a62810918f8a27b5755258521422eb912a1edfd8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 25 Mar 2012 13:33:36 -0700
Subject: fix responsive navbar

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 4904eba16..3cba210a1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -40,7 +40,7 @@
             
           
           Bootstrap
-          

+          

             
    
               
  • 
                 Overview
-- 
cgit v1.2.3


From 825227474b57c90181e9c1b43da952d01b6c1dc1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 25 Mar 2012 17:37:38 -0700
Subject: add refresh method documentation to js docs to close #2028 and #2795

---
 docs/javascript.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 3cba210a1..70646afdb 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -571,6 +571,14 @@ $('#myModal').on('hidden', function () {
             Heads up!
             Navbar links must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
           

+          
Methods

+          
.scrollspy('refresh')

+          
When using scrollspy in conjunction with adding or removing of elements from the DOM, you'll need to call the refresh method like so:

+
+$('[data-spy="scroll"]').each(function () {
+  var $spy = $(this).scrollspy('refresh')
+});
+

           
Options

           
-- 
cgit v1.2.3


From 5d2062a3ccb0fed4901fc9f312c961d042f569bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= 
Date: Tue, 27 Mar 2012 08:36:34 +0200
Subject: Finish of close conversion from a to button

---
 docs/javascript.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 70646afdb..4f777e031 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -208,7 +208,7 @@
           

             

               

-                ×
+                
                 
Modal header

               

               

@@ -226,7 +226,7 @@
           
           

+             
+               
+               
+               
+               
+             

             
highlights all default matches
                Method used to highlight autocomplete results. Accepts a single argument item and has the scope of the typeahead instance. Should return html.
              
updaterfunctionupdates input with selectionMethod used to update input contents. Accepts a single argument item and has the scope of the typeahead instance. Should return a string.

             
           

 
-- 
cgit v1.2.3


From 031fa47f68f5655bf68f0c9ebf551f92028bf5d8 Mon Sep 17 00:00:00 2001
From: Nirav Sanghani 
Date: Mon, 16 Apr 2012 17:27:34 -0700
Subject: Update new typeahead method docs to be a bit clearer.

---
 docs/javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index b6f7ce92e..2261e65b8 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1493,8 +1493,8 @@ $('.carousel').carousel({
              
                updater
                function
-               updates input with selection
-               Method used to update input contents. Accepts a single argument item and has the scope of the typeahead instance. Should return a string.
+               replaces contents of text input with typeahead selection
+               Method used to update contents of text input. Accepts a single argument, the item selected from the typeahead, and has the scope of the typeahead instance. Should return a string.
              
             
           
-- 
cgit v1.2.3


From f3cf4cbaae8c3b3aaed299b63d1773d85cd7789a Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 16 Apr 2012 17:36:03 -0700
Subject: rebuild

---
 docs/javascript.html | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 2261e65b8..7ad42ae81 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1490,12 +1490,6 @@ $('.carousel').carousel({
                highlights all default matches
                Method used to highlight autocomplete results. Accepts a single argument item and has the scope of the typeahead instance. Should return html.
              
-             
-               updater
-               function
-               replaces contents of text input with typeahead selection
-               Method used to update contents of text input. Accepts a single argument, the item selected from the typeahead, and has the scope of the typeahead instance. Should return a string.
-             
             
           
 
-- 
cgit v1.2.3