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/templates/pages/javascript.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates/pages/javascript.mustache') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 7fd4c98d0..007974183 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1232,7 +1232,7 @@ $('#myCollapsible').on('hidden', function () { {{_i}}interval{{/i}} {{_i}}number{{/i}} 5000 - {{_i}}The amount of time to delay between automatically cycling an item.{{/i}} + {{_i}}The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.{{/i}} {{_i}}pause{{/i}} -- 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/templates/pages/javascript.mustache | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'docs/templates/pages/javascript.mustache') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 007974183..2de696210 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -513,6 +513,21 @@ $('#myModal').on('hidden', function () { +

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

+ + + + + + + + + + + + + +
{{_i}}Event{{/i}}{{_i}}Description{{/i}}
{{_i}}activate{{/i}}{{_i}}This event fires whenever a new item becomes activated by the scrollspy.{{/i}}
-- cgit v1.2.3 From 2f06366399f1b0572b0dbcbadcf06df9e4867f2b Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Wed, 21 Mar 2012 12:09:00 +0100 Subject: Make changes in page templates, rebuild --- docs/templates/pages/javascript.mustache | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'docs/templates/pages/javascript.mustache') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 7fd4c98d0..b61a0d424 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -562,8 +562,13 @@ $('#myModal').on('hidden', function () {

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

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

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

{{_i}}You can also activate a specific tab (or a pseudo-selected one) on init:{{/i}}

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

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

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

@@ -817,7 +822,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}})

-- 
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/templates/pages/javascript.mustache | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index b61a0d424..925377339 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}}You can select individual tabs in several ways:{{/i}}

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


From 0e73a0e94b70eab01ca0cafbec48a892531304af Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 22 Mar 2012 17:09:54 -0700
Subject: change spacing and fix code blocks

---
 docs/templates/pages/javascript.mustache | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c6d1f403c..01fcb9761 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -568,10 +568,10 @@ $('#myTab a').click(function (e) {
 })

           
{{_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)
+$('#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. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.{{/i}}

@@ -585,7 +585,7 @@ $('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
           
{{_i}}Methods{{/i}}

           
$().tab

           

-            {{_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}}
+            {{_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" id="myTab">
@@ -604,7 +604,7 @@ $('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
 
 <script>
   $(function () {
-    $('#myTab a:last').tab('show')
+    $('#myTab a:last').tab('show');
   })
 </script>

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

-- 
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/templates/pages/javascript.mustache | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 01fcb9761..06816c7ad 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1036,7 +1036,8 @@ $('#my-alert').bind('closed', function () {
           
{{_i}}About{{/i}}

           
{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}

           {{_i}}Download file{{/i}}
-        
+          
* {{_i}}Requires the Transitions plugin to be included.{{/i}}

+       
         

           
{{_i}}Example accordion{{/i}}

           
{{_i}}Using the collapse plugin, we built a simple accordion style widget:{{/i}}

-- 
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/templates/pages/javascript.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 1c5b96d2e..e037dd024 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -721,7 +721,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                {{_i}}number | object{{/i}}
                0
                
-                
{{_i}}delay showing and hiding the tooltip (ms){{/i}}

+                
{{_i}}delay showing and hiding the tooltip (ms) - does not apply to manual trigger type{{/i}}

                 
{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

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

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

+                
{{_i}}delay showing and hiding the popover (ms) - does not apply to manual trigger type{{/i}}

                 
{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

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

                
-- 
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/templates/pages/javascript.mustache | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index e037dd024..a5010f226 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -494,6 +494,14 @@ $('#myModal').on('hidden', function () {
             {{_i}}Heads up!{{/i}}
             {{_i}}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>.{{/i}}
           

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

+          
.scrollspy('refresh')

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

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

           
{{_i}}Options{{/i}}

           
-- 
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/templates/pages/javascript.mustache | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index a5010f226..d61a364f0 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -131,7 +131,7 @@
           

             

               

-                ×
+                
                 
{{_i}}Modal header{{/i}}

               

               

@@ -149,7 +149,7 @@