From 99f395bcd7ad18ec1ef63b88516e98b294b5bc12 Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Wed, 1 Feb 2012 23:30:37 -0800 Subject: Typo fixes --- docs/javascript.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index db6948392..65deacbd9 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -134,7 +134,7 @@
@@ -628,7 +628,7 @@ $('#myModal').on('hidden', function () { <li><a href="#home" data-toggle="tab">Home</a></li> <li><a href="#profile" data-toggle="tab">Profile</a></li> <li><a href="#messages" data-toggle="tab">Messages</a></li> - <li><a href="#ettings" data-toggle="tab">Settings</a></li> + <li><a href="#settings" data-toggle="tab">Settings</a></li> </ul>

Methods

$().tab

@@ -1145,7 +1145,7 @@ $('#my-alert').bind('closed', function () { parent selector false - If selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior) + If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior) toggle -- cgit v1.2.3 From cf488c2800293f4f243f59658b691741f4b78175 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:33:18 -0800 Subject: fix incorrect uses of it's in the 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 92e327d19..4c432ee7c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1042,7 +1042,7 @@ $('#my-alert').bind('closed', function () {

Methods

$().button('toggle')

-

Toggles push state. Gives btn the look that it's been activated.

+

Toggles push state. Gives btn the look that it hass been activated.

Heads up! You can enable auto toggling of a button by using the data-toggle attribute. @@ -1339,7 +1339,7 @@ $('.myCarousel').carousel({ slid - This event is fired when the carousel has completed it's slide transition. + This event is fired when the carousel has completed its slide transition. -- cgit v1.2.3 From 679cd5ea02ca83d9c3755d6ac74f4a0bacd02897 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:38:49 -0800 Subject: #1706: protocol independent html5shim added, and moved after the CSS for loading time's sake --- 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 8d44fa03d..7ffb96cff 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -7,17 +7,17 @@ - - - + + + -- cgit v1.2.3 From 418bf5221a70440aeecffe9ad9006b444aaf1747 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:50:26 -0800 Subject: #1712: fix typo in js docs --- 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 7ffb96cff..5d505eb4f 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1422,7 +1422,7 @@ $('.myCarousel').carousel({

Methods

.typeahead(options)

-

Initializes an input with a typahead.

+

Initializes an input with a typeahead.

-- cgit v1.2.3 From ff91b233eb51da94451114f45e276ba325f67479 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:50:55 -0800 Subject: fix #1665 by correcting tabs example markup --- 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 e3e274b2f..b6abe80ea 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -624,7 +624,7 @@ $('#myModal').on('hidden', function () {

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.

-<ul class="tabs">
+<ul class="nav nav-tabs">
   <li><a href="#home" data-toggle="tab">Home</a></li>
   <li><a href="#profile" data-toggle="tab">Profile</a></li>
   <li><a href="#messages" data-toggle="tab">Messages</a></li>
@@ -636,7 +636,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="tabs">
+<ul class="nav nav-tabs">
   <li class="active"><a href="#home">Home</a></li>
   <li><a href="#profile">Profile</a></li>
   <li><a href="#messages">Messages</a></li>
-- 
cgit v1.2.3


From 7dffeb471f53bc3fa974abdd567690f770c8b647 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 6 Feb 2012 23:55:18 -0800
Subject: fix #1786 to manually fix typo in js docs links

---
 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 02467051d..97dfc54a2 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -801,7 +801,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
         

           
About popovers

           
Add small overlays of content, like those on the iPad, to any element for housing secondary information.

-          
* Requires Tooltip to be included

+          
* Requires Tooltip to be included

           Download file
         

         

-- 
cgit v1.2.3


From 11f72f6aa22c9d2daa9a95846e6c786afd7bc3e1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 7 Feb 2012 00:31:01 -0800
Subject: merge in #1782, remake to compile html, add some i18n tags

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 97dfc54a2..395394d02 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -773,6 +773,9 @@ $('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 selector option.

+
+<a href="#" rel="tooltip" title="first tooltip">hover over me</a>
+

           
Methods

           
$().tooltip(options)

           
Attaches a tooltip handler to an element collection.

-- 
cgit v1.2.3


From 04fd01d4b67b8f71fe58affb34fcf4907ccabc98 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 7 Feb 2012 22:04:52 -0800
Subject: fix docs for carousel markup

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 395394d02..28c0964f0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1304,10 +1304,12 @@ $('#myCollapsible').on('hidden', function () {
           
Markup

           
Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.

 
-<div class="carousel">
+<div id="myCarousel" class="carousel">
   <!-- Carousel items -->
   <div class="carousel-inner">
-    ...
+    <div class="active item">…</div>
+    <div class="item">…</div>
+    <div class="item">…</div>
   </div>
   <!-- Carousel nav -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
-- 
cgit v1.2.3


From b36a744fa74ace319b9f924f777df50591ceb62c Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 7 Feb 2012 22:32:32 -0800
Subject: remove small class

---
 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 28c0964f0..06ce514a1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -926,7 +926,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             
Oh snap! You got an error!

             
Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

             

-              Take this action Or do this
+              Take this action Or do this
             

           
           

-- 
cgit v1.2.3


From 02cb4df4697acacfdc65560e14994eccd6ebda7e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:01:35 -0800
Subject: fix some single vs double quotes, fix typo in js docs per #1900

---
 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 06ce514a1..2d8b0f596 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -700,14 +700,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
       

         

           
About Tooltips

-          
Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.

+          
Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.

           Download file
         

         

           
Example use of Tooltips

           
Hover over the links below to see tooltips:

           

-            
Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
+            
Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
             

           

           

-- 
cgit v1.2.3


From cbccbed8c8ebdfe0f02502b1915106d56c90b3cc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 00:10:26 -0800
Subject: fix javascript text on tooltips per #1862

---
 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 2d8b0f596..1d0afb9e0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -134,7 +134,7 @@
         

           
         

         

-- 
cgit v1.2.3


From ed07a4d0ce0e769ef6efbd8d465670b26a0a5e37 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 12 Feb 2012 11:06:50 -0800
Subject: add note about popover placement

---
 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 06ce514a1..861c18c1a 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -733,7 +733,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
              
                placement
-               string
+               string|function
                'top'
                how to position the tooltip - top | bottom | left | right
              
@@ -836,7 +836,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
              
                placement
-               string
+               string|function
                'right'
                how to position the popover - top | bottom | left | right
              
-- 
cgit v1.2.3


From a72ef967ba7e4870fb1d737dedf8bf8a10ae6587 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:08:33 -0800
Subject: re-add protocol to the shim

---
 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 1d0afb9e0..21f27263b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -7,17 +7,17 @@
     
     
 
+    
+    
+
     
     
     
     
     
 
-    
-    
-
     
     
     
-- 
cgit v1.2.3


From c02df9390330b3fa6b9c7cd0b4390093c163fae9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 11:08:58 -0800
Subject: move shim after css

---
 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 21f27263b..855cd82bc 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -7,17 +7,17 @@
     
     
 
-    
-    
-
     
     
     
     
     
 
+    
+    
+
     
     
     
-- 
cgit v1.2.3


From da948508447de169ab05c10a5f0a64bcb6a8aeb6 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 12 Feb 2012 22:50:21 -0800
Subject: fix filename mention in js docs per #1938

---
 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 f5563ac53..4ab4f5af3 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -930,7 +930,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             

           

           

-          
Using bootstrap-alerts.js

+          
Using bootstrap-alert.js

           
Enable dismissal of an alert via javascript:

           
$(".alert").alert()

           
Markup

-- 
cgit v1.2.3


From b3e4e5ae2212c4bda6424815871499d9c7693ee6 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 16 Feb 2012 20:33:15 -0800
Subject: add idea to modal markup exmaple

---
 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 4ab4f5af3..612724c79 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -289,7 +289,7 @@
 

 
 
-<div class="modal">
+<div class="modal" id="myModal">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3>Modal header</h3>
-- 
cgit v1.2.3